diff --git a/extras/src/test/java/com/google/gson/graph/GraphAdapterBuilderTest.java b/extras/src/test/java/com/google/gson/graph/GraphAdapterBuilderTest.java
index fa2f9771..9c9503cc 100644
--- a/extras/src/test/java/com/google/gson/graph/GraphAdapterBuilderTest.java
+++ b/extras/src/test/java/com/google/gson/graph/GraphAdapterBuilderTest.java
@@ -129,6 +129,7 @@ public final class GraphAdapterBuilderTest {
   @Test
   public void testSerializationWithMultipleTypes() {
     Company google = new Company("Google");
+    // Employee constructor adds `this` to the given Company object
     Employee unused1 = new Employee("Jesse", google);
     Employee unused2 = new Employee("Joel", google);
 
diff --git a/gson/src/main/java/com/google/gson/JsonElement.java b/gson/src/main/java/com/google/gson/JsonElement.java
index c2647d90..23e5654a 100644
--- a/gson/src/main/java/com/google/gson/JsonElement.java
+++ b/gson/src/main/java/com/google/gson/JsonElement.java
@@ -144,7 +144,7 @@ public abstract class JsonElement {
    * @throws IllegalStateException if this element is of another type.
    * @since 1.2
    */
-  @CanIgnoreReturnValue
+  @CanIgnoreReturnValue // When this method is used only to verify that the value is JsonNull
   public JsonNull getAsJsonNull() {
     if (isJsonNull()) {
       return (JsonNull) this;
diff --git a/gson/src/main/java/com/google/gson/JsonStreamParser.java b/gson/src/main/java/com/google/gson/JsonStreamParser.java
index 54b946cc..cbc2883c 100644
--- a/gson/src/main/java/com/google/gson/JsonStreamParser.java
+++ b/gson/src/main/java/com/google/gson/JsonStreamParser.java
@@ -15,7 +15,6 @@
  */
 package com.google.gson;
 
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.gson.internal.Streams;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
diff --git a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
index ca827555..d0d2eff7 100644
--- a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
@@ -124,11 +124,11 @@ public class DefaultTypeAdaptersTest {
   public void testUrlDeserialization() {
     String urlValue = "http://google.com/";
     String json = "'http:\\/\\/google.com\\/'";
-    URL target = gson.fromJson(json, URL.class);
-    assertThat(target.toExternalForm()).isEqualTo(urlValue);
+    URL target1 = gson.fromJson(json, URL.class);
+    assertThat(target1.toExternalForm()).isEqualTo(urlValue);
 
-    URL unused = gson.fromJson('"' + urlValue + '"', URL.class);
-    assertThat(target.toExternalForm()).isEqualTo(urlValue);
+    URL target2 = gson.fromJson('"' + urlValue + '"', URL.class);
+    assertThat(target2.toExternalForm()).isEqualTo(urlValue);
   }
 
   @Test