diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringHttp.qll b/java/ql/src/semmle/code/java/frameworks/spring/SpringHttp.qll
index e733e9b6a15..faf57d724ee 100644
--- a/java/ql/src/semmle/code/java/frameworks/spring/SpringHttp.qll
+++ b/java/ql/src/semmle/code/java/frameworks/spring/SpringHttp.qll
@@ -1,39 +1,35 @@
 import java
 
+/** The class `org.springframework.http.HttpEntity` or an instantiation of it. */
 class SpringHttpEntity extends Class {
   SpringHttpEntity() {
-    getSourceDeclaration()
-        .getErasure()
-        .(RefType)
-        .hasQualifiedName("org.springframework.http", "HttpEntity")
+    this.getSourceDeclaration().hasQualifiedName("org.springframework.http", "HttpEntity")
   }
 }
 
+/** The class `org.springframework.http.RequestEntity` or an instantiation of it. */
 class SpringRequestEntity extends Class {
   SpringRequestEntity() {
-    getSourceDeclaration()
-        .getErasure()
-        .(RefType)
-        .hasQualifiedName("org.springframework.http", "RequestEntity")
+    this.getSourceDeclaration().hasQualifiedName("org.springframework.http", "RequestEntity")
   }
 }
 
+/** The class `org.springframework.http.ResponseEntity` or an instantiation of it. */
 class SpringResponseEntity extends Class {
   SpringResponseEntity() {
-    getSourceDeclaration()
-        .getErasure()
-        .(RefType)
-        .hasQualifiedName("org.springframework.http", "ResponseEntity")
+    this.getSourceDeclaration().hasQualifiedName("org.springframework.http", "ResponseEntity")
   }
 }
 
+/** The nested class `BodyBuilder` in `org.springframework.http.ResponseEntity`. */
 class SpringResponseEntityBodyBuilder extends Interface {
   SpringResponseEntityBodyBuilder() {
-    getSourceDeclaration().getEnclosingType() = any(SpringResponseEntity sre) and
-    hasName("BodyBuilder")
+    this.getSourceDeclaration().getEnclosingType() instanceof SpringResponseEntity and
+    this.hasName("BodyBuilder")
   }
 }
 
+/** The class `org.springframework.http.HttpHeaders`. */
 class SpringHttpHeaders extends Class {
-  SpringHttpHeaders() { hasQualifiedName("org.springframework.http", "HttpHeaders") }
-}
\ No newline at end of file
+  SpringHttpHeaders() { this.hasQualifiedName("org.springframework.http", "HttpHeaders") }
+}