Cleanups

Author: joefarebrother

Diff for: python/ql/src/Variables/LoopVariableCapture/LoopVariableCapture.ql

@@ -11,7 +11,6 @@
 
 import python
 import LoopVariableCaptureQuery
-import semmle.python.dataflow.new.DataFlow
 import EscapingCaptureFlow::PathGraph
 
 from

Diff for: python/ql/test/query-tests/Variables/capture/LoopVariableCaptureTest.ql

@@ -3,11 +3,11 @@ import Variables.LoopVariableCapture.LoopVariableCaptureQuery
 import utils.test.InlineExpectationsTest
 
 module MethodArgTest implements TestSig {
-  string getARelevantTag() { result = ["capturedVar"] }
+  string getARelevantTag() { result = "capturedVar" }
 
   predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(CallableExpr capturing, AstNode loop, Variable var |
-      escapingCapture(capturing, loop, var, _, _) and
+    exists(CallableExpr capturing, Variable var |
+      escapingCapture(capturing, _, var, _, _) and
       element = capturing.toString() and
       location = capturing.getLocation() and
       tag = "capturedVar" and