diff --git a/ql/src/semmle/go/frameworks/CleverGo.qll b/ql/src/semmle/go/frameworks/CleverGo.qll
index 53c16b7c1a0..258edebc698 100644
--- a/ql/src/semmle/go/frameworks/CleverGo.qll
+++ b/ql/src/semmle/go/frameworks/CleverGo.qll
@@ -81,14 +81,15 @@ private module CleverGo {
       )
       or
       // Structs of package: clevergo.tech/clevergo@v0.5.2
-      exists(DataFlow::Field fld |
-        // Struct: Context
-        fld.hasQualifiedName(packagePath(), "Context", "Params")
-        or
-        // Struct: Param
-        fld.hasQualifiedName(packagePath(), "Param", ["Key", "Value"])
+      exists(string structName, string fields, DataFlow::Field fld |
+        this = fld.getARead() and
+        fld.hasQualifiedName(packagePath(), structName, fields)
       |
-        this = fld.getARead()
+        structName = "Context" and
+        fields = "Params"
+        or
+        structName = "Param" and
+        fields = ["Value", "Key"]
       )
       or
       // Types of package: clevergo.tech/clevergo@v0.5.2