Python: Remove omittable exists variables

python/ql/lib/analysis/DefinitionTracking.qll

@@ -221,10 +221,8 @@ pragma[noinline]
 private predicate module_and_name_for_import_star(
   ModuleObject mod, string name, ImportStarRefinement def
 ) {
-  exists(ImportStarNode im_star |
-    module_and_name_for_import_star_helper(mod, name, im_star, def) and
-    mod.exports(name)
-  )
+  module_and_name_for_import_star_helper(mod, name, _, def) and
+  mod.exports(name)
 }
 
 pragma[noinline]
@@ -484,9 +482,9 @@ class NiceLocationExpr extends Expr {
    */
   predicate hasLocationInfo(string f, int bl, int bc, int el, int ec) {
     /* Attribute location for x.y is that of 'y' so that url does not overlap with that of 'x' */
-    exists(int abl, int abc | this.(Attribute).getLocation().hasLocationInfo(f, abl, abc, el, ec) |
-      bl = el and bc = ec - this.(Attribute).getName().length() + 1
-    )
+    this.(Attribute).getLocation().hasLocationInfo(f, _, _, el, ec) and
+    bl = el and
+    bc = ec - this.(Attribute).getName().length() + 1
     or
     this.(Name).getLocation().hasLocationInfo(f, bl, bc, el, ec)
     or

python/ql/lib/semmle/python/Flow.qll

@@ -385,9 +385,9 @@ class CallNode extends ControlFlowNode {
 
   /** Gets the flow node corresponding to an argument of the call corresponding to this flow node */
   ControlFlowNode getAnArg() {
-    exists(int n | result = this.getArg(n))
+    result = this.getArg(_)
     or
-    exists(string name | result = this.getArgByName(name))
+    result = this.getArgByName(_)
   }
 
   override Call getNode() { result = super.getNode() }

python/ql/lib/semmle/python/RegexTreeView.qll

@@ -227,8 +227,8 @@ module Impl implements RegexTreeViewSig {
     predicate hasLocationInfo(
       string filepath, int startline, int startcolumn, int endline, int endcolumn
     ) {
-      exists(int re_start, int re_end |
-        re.getLocation().hasLocationInfo(filepath, startline, re_start, endline, re_end) and
+      exists(int re_start |
+        re.getLocation().hasLocationInfo(filepath, startline, re_start, endline, _) and
         startcolumn = re_start + start + 4 and
         endcolumn = re_start + end + 3
       )

python/ql/lib/semmle/python/SelfAttribute.qll

@@ -78,8 +78,8 @@ private predicate attr_assigned_in_method_arg_n(FunctionObject method, string na
       attr.isStore()
     )
     or
-    exists(CallNode call, FunctionObject callee, int m |
-      callee.getArgumentForCall(call, m) = param.getAUse() and
+    exists(FunctionObject callee, int m |
+      callee.getArgumentForCall(_, m) = param.getAUse() and
       attr_assigned_in_method_arg_n(callee, name, m)
     )
   )

python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll

@@ -876,9 +876,9 @@ private module Stage1 implements StageSig {
 
   pragma[nomagic]
   private predicate revFlowOut(ReturnPosition pos, Configuration config) {
-    exists(DataFlowCall call, NodeEx out |
+    exists(NodeEx out |
       revFlow(out, _, config) and
-      viableReturnPosOutNodeCandFwd1(call, pos, out, config)
+      viableReturnPosOutNodeCandFwd1(_, pos, out, config)
     )
   }
 
@@ -1731,8 +1731,8 @@ private module MkStage<StageSig PrevStage> {
       )
       or
       // flow through a callable
-      exists(DataFlowCall call, ParamNodeEx p, ReturnPosition pos, Ap innerReturnAp |
-        revFlowThrough(call, returnCtx, p, state, pos, returnAp, ap, innerReturnAp, config) and
+      exists(DataFlowCall call, ParamNodeEx p, Ap innerReturnAp |
+        revFlowThrough(call, returnCtx, p, state, _, returnAp, ap, innerReturnAp, config) and
         flowThroughIntoCall(call, node, p, _, ap, innerReturnAp, config)
       )
       or
@@ -1901,8 +1901,8 @@ private module MkStage<StageSig PrevStage> {
 
     pragma[nomagic]
     predicate parameterMayFlowThrough(ParamNodeEx p, Ap ap, Configuration config) {
-      exists(RetNodeEx ret, ReturnPosition pos |
-        returnFlowsThrough(ret, pos, _, _, p, ap, _, config) and
+      exists(ReturnPosition pos |
+        returnFlowsThrough(_, pos, _, _, p, ap, _, config) and
         parameterFlowsThroughRev(p, ap, pos, _, config)
       )
     }
@@ -1923,8 +1923,8 @@ private module MkStage<StageSig PrevStage> {
       DataFlowCall call, ArgNodeEx arg, FlowState state, ReturnCtx returnCtx, ApOption returnAp,
       Ap ap, Configuration config
     ) {
-      exists(ParamNodeEx p, ReturnPosition pos, Ap innerReturnAp |
-        revFlowThrough(call, returnCtx, p, state, pos, returnAp, ap, innerReturnAp, config) and
+      exists(ParamNodeEx p, Ap innerReturnAp |
+        revFlowThrough(call, returnCtx, p, state, _, returnAp, ap, innerReturnAp, config) and
         flowThroughIntoCall(call, arg, p, _, ap, innerReturnAp, config)
       )
     }
@@ -3749,8 +3749,8 @@ private predicate paramFlowsThrough(
   ReturnKindExt kind, FlowState state, CallContextCall cc, SummaryCtxSome sc, AccessPath ap,
   AccessPathApprox apa, Configuration config
 ) {
-  exists(PathNodeMid mid, RetNodeEx ret |
-    pathNode(mid, ret, state, cc, sc, ap, config, _) and
+  exists(RetNodeEx ret |
+    pathNode(_, ret, state, cc, sc, ap, config, _) and
     kind = ret.getKind() and
     apa = ap.getApprox() and
     parameterFlowThroughAllowed(sc.getParamNode(), kind)
@@ -4212,17 +4212,15 @@ private module FlowExploration {
       ap = TRevPartialNil() and
       exists(config.explorationLimit())
       or
-      exists(PartialPathNodeRev mid |
-        revPartialPathStep(mid, node, state, sc1, sc2, sc3, ap, config) and
-        not clearsContentEx(node, ap.getHead()) and
-        (
-          notExpectsContent(node) or
-          expectsContentEx(node, ap.getHead())
-        ) and
-        not fullBarrier(node, config) and
-        not stateBarrier(node, state, config) and
-        distSink(node.getEnclosingCallable(), config) <= config.explorationLimit()
-      )
+      revPartialPathStep(_, node, state, sc1, sc2, sc3, ap, config) and
+      not clearsContentEx(node, ap.getHead()) and
+      (
+        notExpectsContent(node) or
+        expectsContentEx(node, ap.getHead())
+      ) and
+      not fullBarrier(node, config) and
+      not stateBarrier(node, state, config) and
+      distSink(node.getEnclosingCallable(), config) <= config.explorationLimit()
     }
 
   pragma[nomagic]
@@ -4230,19 +4228,17 @@ private module FlowExploration {
     NodeEx node, FlowState state, CallContext cc, TSummaryCtx1 sc1, TSummaryCtx2 sc2,
     TSummaryCtx3 sc3, PartialAccessPath ap, Configuration config
   ) {
-    exists(PartialPathNodeFwd mid |
-      partialPathStep(mid, node, state, cc, sc1, sc2, sc3, ap, config) and
-      not fullBarrier(node, config) and
-      not stateBarrier(node, state, config) and
-      not clearsContentEx(node, ap.getHead().getContent()) and
-      (
-        notExpectsContent(node) or
-        expectsContentEx(node, ap.getHead().getContent())
-      ) and
-      if node.asNode() instanceof CastingNode
-      then compatibleTypes(node.getDataFlowType(), ap.getType())
-      else any()
-    )
+    partialPathStep(_, node, state, cc, sc1, sc2, sc3, ap, config) and
+    not fullBarrier(node, config) and
+    not stateBarrier(node, state, config) and
+    not clearsContentEx(node, ap.getHead().getContent()) and
+    (
+      notExpectsContent(node) or
+      expectsContentEx(node, ap.getHead().getContent())
+    ) and
+    if node.asNode() instanceof CastingNode
+    then compatibleTypes(node.getDataFlowType(), ap.getType())
+    else any()
   }
 
   /**

python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll

@@ -876,9 +876,9 @@ private module Stage1 implements StageSig {
 
   pragma[nomagic]
   private predicate revFlowOut(ReturnPosition pos, Configuration config) {
-    exists(DataFlowCall call, NodeEx out |
+    exists(NodeEx out |
       revFlow(out, _, config) and
-      viableReturnPosOutNodeCandFwd1(call, pos, out, config)
+      viableReturnPosOutNodeCandFwd1(_, pos, out, config)
     )
   }
 
@@ -1731,8 +1731,8 @@ private module MkStage<StageSig PrevStage> {
       )
       or
       // flow through a callable
-      exists(DataFlowCall call, ParamNodeEx p, ReturnPosition pos, Ap innerReturnAp |
-        revFlowThrough(call, returnCtx, p, state, pos, returnAp, ap, innerReturnAp, config) and
+      exists(DataFlowCall call, ParamNodeEx p, Ap innerReturnAp |
+        revFlowThrough(call, returnCtx, p, state, _, returnAp, ap, innerReturnAp, config) and
         flowThroughIntoCall(call, node, p, _, ap, innerReturnAp, config)
       )
       or
@@ -1901,8 +1901,8 @@ private module MkStage<StageSig PrevStage> {
 
     pragma[nomagic]
     predicate parameterMayFlowThrough(ParamNodeEx p, Ap ap, Configuration config) {
-      exists(RetNodeEx ret, ReturnPosition pos |
-        returnFlowsThrough(ret, pos, _, _, p, ap, _, config) and
+      exists(ReturnPosition pos |
+        returnFlowsThrough(_, pos, _, _, p, ap, _, config) and
         parameterFlowsThroughRev(p, ap, pos, _, config)
       )
     }
@@ -1923,8 +1923,8 @@ private module MkStage<StageSig PrevStage> {
       DataFlowCall call, ArgNodeEx arg, FlowState state, ReturnCtx returnCtx, ApOption returnAp,
       Ap ap, Configuration config
     ) {
-      exists(ParamNodeEx p, ReturnPosition pos, Ap innerReturnAp |
-        revFlowThrough(call, returnCtx, p, state, pos, returnAp, ap, innerReturnAp, config) and
+      exists(ParamNodeEx p, Ap innerReturnAp |
+        revFlowThrough(call, returnCtx, p, state, _, returnAp, ap, innerReturnAp, config) and
         flowThroughIntoCall(call, arg, p, _, ap, innerReturnAp, config)
       )
     }
@@ -3749,8 +3749,8 @@ private predicate paramFlowsThrough(
   ReturnKindExt kind, FlowState state, CallContextCall cc, SummaryCtxSome sc, AccessPath ap,
   AccessPathApprox apa, Configuration config
 ) {
-  exists(PathNodeMid mid, RetNodeEx ret |
-    pathNode(mid, ret, state, cc, sc, ap, config, _) and
+  exists(RetNodeEx ret |
+    pathNode(_, ret, state, cc, sc, ap, config, _) and
     kind = ret.getKind() and
     apa = ap.getApprox() and
     parameterFlowThroughAllowed(sc.getParamNode(), kind)
@@ -4212,17 +4212,15 @@ private module FlowExploration {
       ap = TRevPartialNil() and
       exists(config.explorationLimit())
       or
-      exists(PartialPathNodeRev mid |
-        revPartialPathStep(mid, node, state, sc1, sc2, sc3, ap, config) and
-        not clearsContentEx(node, ap.getHead()) and
-        (
-          notExpectsContent(node) or
-          expectsContentEx(node, ap.getHead())
-        ) and
-        not fullBarrier(node, config) and
-        not stateBarrier(node, state, config) and
-        distSink(node.getEnclosingCallable(), config) <= config.explorationLimit()
-      )
+      revPartialPathStep(_, node, state, sc1, sc2, sc3, ap, config) and
+      not clearsContentEx(node, ap.getHead()) and
+      (
+        notExpectsContent(node) or
+        expectsContentEx(node, ap.getHead())
+      ) and
+      not fullBarrier(node, config) and
+      not stateBarrier(node, state, config) and
+      distSink(node.getEnclosingCallable(), config) <= config.explorationLimit()
     }
 
   pragma[nomagic]
@@ -4230,19 +4228,17 @@ private module FlowExploration {
     NodeEx node, FlowState state, CallContext cc, TSummaryCtx1 sc1, TSummaryCtx2 sc2,
     TSummaryCtx3 sc3, PartialAccessPath ap, Configuration config
   ) {
-    exists(PartialPathNodeFwd mid |
-      partialPathStep(mid, node, state, cc, sc1, sc2, sc3, ap, config) and
-      not fullBarrier(node, config) and
-      not stateBarrier(node, state, config) and
-      not clearsContentEx(node, ap.getHead().getContent()) and
-      (
-        notExpectsContent(node) or
-        expectsContentEx(node, ap.getHead().getContent())
-      ) and
-      if node.asNode() instanceof CastingNode
-      then compatibleTypes(node.getDataFlowType(), ap.getType())
-      else any()
-    )
+    partialPathStep(_, node, state, cc, sc1, sc2, sc3, ap, config) and
+    not fullBarrier(node, config) and
+    not stateBarrier(node, state, config) and
+    not clearsContentEx(node, ap.getHead().getContent()) and
+    (
+      notExpectsContent(node) or
+      expectsContentEx(node, ap.getHead().getContent())
+    ) and
+    if node.asNode() instanceof CastingNode
+    then compatibleTypes(node.getDataFlowType(), ap.getType())
+    else any()
   }
 
   /**

python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll

@@ -876,9 +876,9 @@ private module Stage1 implements StageSig {
 
   pragma[nomagic]
   private predicate revFlowOut(ReturnPosition pos, Configuration config) {
-    exists(DataFlowCall call, NodeEx out |
+    exists(NodeEx out |
       revFlow(out, _, config) and
-      viableReturnPosOutNodeCandFwd1(call, pos, out, config)
+      viableReturnPosOutNodeCandFwd1(_, pos, out, config)
     )
   }
 
@@ -1731,8 +1731,8 @@ private module MkStage<StageSig PrevStage> {
       )
       or
       // flow through a callable
-      exists(DataFlowCall call, ParamNodeEx p, ReturnPosition pos, Ap innerReturnAp |
-        revFlowThrough(call, returnCtx, p, state, pos, returnAp, ap, innerReturnAp, config) and
+      exists(DataFlowCall call, ParamNodeEx p, Ap innerReturnAp |
+        revFlowThrough(call, returnCtx, p, state, _, returnAp, ap, innerReturnAp, config) and
         flowThroughIntoCall(call, node, p, _, ap, innerReturnAp, config)
       )
       or
@@ -1901,8 +1901,8 @@ private module MkStage<StageSig PrevStage> {
 
     pragma[nomagic]
     predicate parameterMayFlowThrough(ParamNodeEx p, Ap ap, Configuration config) {
-      exists(RetNodeEx ret, ReturnPosition pos |
-        returnFlowsThrough(ret, pos, _, _, p, ap, _, config) and
+      exists(ReturnPosition pos |
+        returnFlowsThrough(_, pos, _, _, p, ap, _, config) and
         parameterFlowsThroughRev(p, ap, pos, _, config)
       )
     }
@@ -1923,8 +1923,8 @@ private module MkStage<StageSig PrevStage> {
       DataFlowCall call, ArgNodeEx arg, FlowState state, ReturnCtx returnCtx, ApOption returnAp,
       Ap ap, Configuration config
     ) {
-      exists(ParamNodeEx p, ReturnPosition pos, Ap innerReturnAp |
-        revFlowThrough(call, returnCtx, p, state, pos, returnAp, ap, innerReturnAp, config) and
+      exists(ParamNodeEx p, Ap innerReturnAp |
+        revFlowThrough(call, returnCtx, p, state, _, returnAp, ap, innerReturnAp, config) and
         flowThroughIntoCall(call, arg, p, _, ap, innerReturnAp, config)
       )
     }
@@ -3749,8 +3749,8 @@ private predicate paramFlowsThrough(
   ReturnKindExt kind, FlowState state, CallContextCall cc, SummaryCtxSome sc, AccessPath ap,
   AccessPathApprox apa, Configuration config
 ) {
-  exists(PathNodeMid mid, RetNodeEx ret |
-    pathNode(mid, ret, state, cc, sc, ap, config, _) and
+  exists(RetNodeEx ret |
+    pathNode(_, ret, state, cc, sc, ap, config, _) and
     kind = ret.getKind() and
     apa = ap.getApprox() and
     parameterFlowThroughAllowed(sc.getParamNode(), kind)
@@ -4212,17 +4212,15 @@ private module FlowExploration {
       ap = TRevPartialNil() and
       exists(config.explorationLimit())
       or
-      exists(PartialPathNodeRev mid |
-        revPartialPathStep(mid, node, state, sc1, sc2, sc3, ap, config) and
-        not clearsContentEx(node, ap.getHead()) and
-        (
-          notExpectsContent(node) or
-          expectsContentEx(node, ap.getHead())
-        ) and
-        not fullBarrier(node, config) and
-        not stateBarrier(node, state, config) and
-        distSink(node.getEnclosingCallable(), config) <= config.explorationLimit()
-      )
+      revPartialPathStep(_, node, state, sc1, sc2, sc3, ap, config) and
+      not clearsContentEx(node, ap.getHead()) and
+      (
+        notExpectsContent(node) or
+        expectsContentEx(node, ap.getHead())
+      ) and
+      not fullBarrier(node, config) and
+      not stateBarrier(node, state, config) and
+      distSink(node.getEnclosingCallable(), config) <= config.explorationLimit()
     }
 
   pragma[nomagic]
@@ -4230,19 +4228,17 @@ private module FlowExploration {
     NodeEx node, FlowState state, CallContext cc, TSummaryCtx1 sc1, TSummaryCtx2 sc2,
     TSummaryCtx3 sc3, PartialAccessPath ap, Configuration config
   ) {
-    exists(PartialPathNodeFwd mid |
-      partialPathStep(mid, node, state, cc, sc1, sc2, sc3, ap, config) and
-      not fullBarrier(node, config) and
-      not stateBarrier(node, state, config) and
-      not clearsContentEx(node, ap.getHead().getContent()) and
-      (
-        notExpectsContent(node) or
-        expectsContentEx(node, ap.getHead().getContent())
-      ) and
-      if node.asNode() instanceof CastingNode
-      then compatibleTypes(node.getDataFlowType(), ap.getType())
-      else any()
-    )
+    partialPathStep(_, node, state, cc, sc1, sc2, sc3, ap, config) and
+    not fullBarrier(node, config) and
+    not stateBarrier(node, state, config) and
+    not clearsContentEx(node, ap.getHead().getContent()) and
+    (
+      notExpectsContent(node) or
+      expectsContentEx(node, ap.getHead().getContent())
+    ) and
+    if node.asNode() instanceof CastingNode
+    then compatibleTypes(node.getDataFlowType(), ap.getType())
+    else any()
   }
 
   /**

python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll

@@ -876,9 +876,9 @@ private module Stage1 implements StageSig {
 
   pragma[nomagic]
   private predicate revFlowOut(ReturnPosition pos, Configuration config) {
-    exists(DataFlowCall call, NodeEx out |
+    exists(NodeEx out |
       revFlow(out, _, config) and
-      viableReturnPosOutNodeCandFwd1(call, pos, out, config)
+      viableReturnPosOutNodeCandFwd1(_, pos, out, config)
     )
   }
 
@@ -1731,8 +1731,8 @@ private module MkStage<StageSig PrevStage> {
       )
       or
       // flow through a callable
-      exists(DataFlowCall call, ParamNodeEx p, ReturnPosition pos, Ap innerReturnAp |
-        revFlowThrough(call, returnCtx, p, state, pos, returnAp, ap, innerReturnAp, config) and
+      exists(DataFlowCall call, ParamNodeEx p, Ap innerReturnAp |
+        revFlowThrough(call, returnCtx, p, state, _, returnAp, ap, innerReturnAp, config) and
         flowThroughIntoCall(call, node, p, _, ap, innerReturnAp, config)
       )
       or
@@ -1901,8 +1901,8 @@ private module MkStage<StageSig PrevStage> {
 
     pragma[nomagic]
     predicate parameterMayFlowThrough(ParamNodeEx p, Ap ap, Configuration config) {
-      exists(RetNodeEx ret, ReturnPosition pos |
-        returnFlowsThrough(ret, pos, _, _, p, ap, _, config) and
+      exists(ReturnPosition pos |
+        returnFlowsThrough(_, pos, _, _, p, ap, _, config) and
         parameterFlowsThroughRev(p, ap, pos, _, config)
       )
     }
@@ -1923,8 +1923,8 @@ private module MkStage<StageSig PrevStage> {
       DataFlowCall call, ArgNodeEx arg, FlowState state, ReturnCtx returnCtx, ApOption returnAp,
       Ap ap, Configuration config
     ) {
-      exists(ParamNodeEx p, ReturnPosition pos, Ap innerReturnAp |
-        revFlowThrough(call, returnCtx, p, state, pos, returnAp, ap, innerReturnAp, config) and
+      exists(ParamNodeEx p, Ap innerReturnAp |
+        revFlowThrough(call, returnCtx, p, state, _, returnAp, ap, innerReturnAp, config) and
         flowThroughIntoCall(call, arg, p, _, ap, innerReturnAp, config)
       )
     }
@@ -3749,8 +3749,8 @@ private predicate paramFlowsThrough(
   ReturnKindExt kind, FlowState state, CallContextCall cc, SummaryCtxSome sc, AccessPath ap,
   AccessPathApprox apa, Configuration config
 ) {
-  exists(PathNodeMid mid, RetNodeEx ret |
-    pathNode(mid, ret, state, cc, sc, ap, config, _) and
+  exists(RetNodeEx ret |
+    pathNode(_, ret, state, cc, sc, ap, config, _) and
     kind = ret.getKind() and
     apa = ap.getApprox() and
     parameterFlowThroughAllowed(sc.getParamNode(), kind)
@@ -4212,17 +4212,15 @@ private module FlowExploration {
       ap = TRevPartialNil() and
       exists(config.explorationLimit())
       or
-      exists(PartialPathNodeRev mid |
-        revPartialPathStep(mid, node, state, sc1, sc2, sc3, ap, config) and
-        not clearsContentEx(node, ap.getHead()) and
-        (
-          notExpectsContent(node) or
-          expectsContentEx(node, ap.getHead())
-        ) and
-        not fullBarrier(node, config) and
-        not stateBarrier(node, state, config) and
-        distSink(node.getEnclosingCallable(), config) <= config.explorationLimit()
-      )
+      revPartialPathStep(_, node, state, sc1, sc2, sc3, ap, config) and
+      not clearsContentEx(node, ap.getHead()) and
+      (
+        notExpectsContent(node) or
+        expectsContentEx(node, ap.getHead())
+      ) and
+      not fullBarrier(node, config) and
+      not stateBarrier(node, state, config) and
+      distSink(node.getEnclosingCallable(), config) <= config.explorationLimit()
     }
 
   pragma[nomagic]
@@ -4230,19 +4228,17 @@ private module FlowExploration {
     NodeEx node, FlowState state, CallContext cc, TSummaryCtx1 sc1, TSummaryCtx2 sc2,
     TSummaryCtx3 sc3, PartialAccessPath ap, Configuration config
   ) {
-    exists(PartialPathNodeFwd mid |
-      partialPathStep(mid, node, state, cc, sc1, sc2, sc3, ap, config) and
-      not fullBarrier(node, config) and
-      not stateBarrier(node, state, config) and
-      not clearsContentEx(node, ap.getHead().getContent()) and
-      (
-        notExpectsContent(node) or
-        expectsContentEx(node, ap.getHead().getContent())
-      ) and
-      if node.asNode() instanceof CastingNode
-      then compatibleTypes(node.getDataFlowType(), ap.getType())
-      else any()
-    )
+    partialPathStep(_, node, state, cc, sc1, sc2, sc3, ap, config) and
+    not fullBarrier(node, config) and
+    not stateBarrier(node, state, config) and
+    not clearsContentEx(node, ap.getHead().getContent()) and
+    (
+      notExpectsContent(node) or
+      expectsContentEx(node, ap.getHead().getContent())
+    ) and
+    if node.asNode() instanceof CastingNode
+    then compatibleTypes(node.getDataFlowType(), ap.getType())
+    else any()
   }
 
   /**

python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplConsistency.qll

@@ -101,9 +101,7 @@ module Consistency {
     exists(int c |
       c =
         strictcount(Node n |
-          not exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
-            n.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-          ) and
+          not n.hasLocationInfo(_, _, _, _, _) and
           not any(ConsistencyConfiguration conf).missingLocationExclude(n)
         ) and
       msg = "Nodes without location: " + c

python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll

@@ -819,9 +819,9 @@ predicate attributeReadStep(Node nodeFrom, AttributeContent c, AttrRead nodeTo)
  * synthesized unpacked argument with the name indicated by `c`.
  */
 predicate kwUnpackReadStep(CfgNode nodeFrom, DictionaryElementContent c, Node nodeTo) {
-  exists(CallNode call, CallableValue callable, string name |
+  exists(CallNode call, string name |
     nodeFrom.asCfgNode() = call.getNode().getKwargs().getAFlowNode() and
-    nodeTo = TKwUnpackedNode(call, callable, name) and
+    nodeTo = TKwUnpackedNode(call, _, name) and
     name = c.getKey()
   )
 }

python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll

@@ -580,10 +580,8 @@ module Private {
           head = TWithContentSummaryComponent(cont)
         )
         or
-        exists(ContentSet cont |
-          head = TWithoutContentSummaryComponent(cont) and
-          result = getNodeType(summaryNodeInputState(c, s.tail()))
-        )
+        head = TWithoutContentSummaryComponent(_) and
+        result = getNodeType(summaryNodeInputState(c, s.tail()))
         or
         exists(ReturnKind rk |
           head = TReturnSummaryComponent(rk) and
@@ -658,8 +656,8 @@ module Private {
 
   /** Holds if summary node `ret` is a return node of kind `rk`. */
   predicate summaryReturnNode(Node ret, ReturnKind rk) {
-    exists(SummarizedCallable callable, SummaryComponentStack s |
-      ret = summaryNodeOutputState(callable, s) and
+    exists(SummaryComponentStack s |
+      ret = summaryNodeOutputState(_, s) and
       s = TSingletonSummaryComponentStack(TReturnSummaryComponent(rk))
     )
   }

python/ql/lib/semmle/python/dataflow/old/Implementation.qll

@@ -531,8 +531,8 @@ class TaintTrackingImplementation extends string instanceof TaintTracking::Confi
     TaintTrackingNode src, DataFlow::Node node, TaintTrackingContext context, AttributePath path,
     TaintKind kind, string edgeLabel
   ) {
-    exists(DataFlow::Node srcnode, CallNode call, TaintKind srckind, string name |
-      src = TTaintTrackingNode_(srcnode, context, path, srckind, this) and
+    exists(CallNode call, TaintKind srckind, string name |
+      src = TTaintTrackingNode_(_, context, path, srckind, this) and
       call.getFunction().(AttrNode).getObject(name) = src.getNode().asCfgNode() and
       kind = srckind.getTaintOfMethodResult(name) and
       node.asCfgNode() = call
@@ -560,8 +560,8 @@ class TaintTrackingImplementation extends string instanceof TaintTracking::Confi
     TaintTrackingNode src, DataFlow::Node node, TaintTrackingContext context, AttributePath path,
     TaintKind kind, string edgeLabel
   ) {
-    exists(CallNode call, PythonFunctionObjectInternal pyfunc, int arg |
-      this.callWithTaintedArgument(src, call, _, pyfunc, arg, path, kind) and
+    exists(PythonFunctionObjectInternal pyfunc, int arg |
+      this.callWithTaintedArgument(src, _, _, pyfunc, arg, path, kind) and
       node.asCfgNode() = pyfunc.getParameter(arg) and
       context = TParamContext(kind, path, arg)
     ) and
@@ -795,11 +795,9 @@ private class EssaTaintTracking extends string instanceof TaintTracking::Configu
     TaintTrackingNode src, PyEdgeRefinement defn, TaintTrackingContext context, AttributePath path,
     TaintKind kind
   ) {
-    exists(DataFlow::Node srcnode, ControlFlowNode use |
-      src = TTaintTrackingNode_(srcnode, context, path, kind, this) and
-      not super.isBarrierTest(defn.getTest(), defn.getSense()) and
-      defn.getSense() = this.testEvaluates(defn, defn.getTest(), use, src)
-    )
+    src = TTaintTrackingNode_(_, context, path, kind, this) and
+    not super.isBarrierTest(defn.getTest(), defn.getSense()) and
+    defn.getSense() = this.testEvaluates(defn, defn.getTest(), _, src)
   }
 
   pragma[noinline]

python/ql/lib/semmle/python/dataflow/old/StateTracking.qll

@@ -99,9 +99,7 @@ module StateTracking {
         exists(int n |
           f = b.getNode(n) and
           appliesToNode(state, b.getNode(n - 1), ctx, sense) and
-          not exists(PythonFunctionObjectInternal func, Context callee |
-            callee.fromCall(f, func, ctx)
-          )
+          not exists(Context callee | callee.fromCall(f, _, ctx))
         )
       )
       or

python/ql/lib/semmle/python/essa/Essa.qll

@@ -108,7 +108,7 @@ private string location_string(EssaVariable v) {
 
 /* Helper to compute an index for this SSA variable. */
 private int var_index(EssaVariable v) {
-  location_string(v) = rank[result](string s | exists(EssaVariable x | location_string(x) = s) | s)
+  location_string(v) = rank[result](string s | location_string(_) = s | s)
 }
 
 /* Helper for `v.getRepresentation()` */

python/ql/lib/semmle/python/objects/Constants.qll

@@ -35,10 +35,8 @@ abstract class ConstantObjectInternal extends ObjectInternal {
   pragma[noinline]
   override predicate attribute(string name, ObjectInternal value, CfgOrigin origin) {
     PointsToInternal::attributeRequired(pragma[only_bind_into](this), pragma[only_bind_into](name)) and
-    exists(ObjectInternal cls_attr, CfgOrigin attr_orig |
-      this.getClass()
-          .(ClassObjectInternal)
-          .lookup(pragma[only_bind_into](name), cls_attr, attr_orig) and
+    exists(ObjectInternal cls_attr |
+      this.getClass().(ClassObjectInternal).lookup(pragma[only_bind_into](name), cls_attr, _) and
       cls_attr.isDescriptor() = true and
       cls_attr.descriptorGetInstance(this, value, origin)
     )

python/ql/lib/semmle/python/objects/Instances.qll

@@ -246,8 +246,8 @@ class SelfInstanceInternal extends TSelfInstance, InstanceObject {
 
   pragma[noinline]
   override predicate binds(ObjectInternal instance, string name, ObjectInternal descriptor) {
-    exists(AttrNode attr, ClassObjectInternal cls |
-      receiver_type(attr, name, this, cls) and
+    exists(ClassObjectInternal cls |
+      receiver_type(_, name, this, cls) and
       cls_descriptor(cls, name, descriptor)
     ) and
     instance = this
@@ -349,8 +349,8 @@ class UnknownInstanceInternal extends TUnknownInstance, ObjectInternal {
 
   pragma[noinline]
   override predicate binds(ObjectInternal instance, string name, ObjectInternal descriptor) {
-    exists(AttrNode attr, ClassObjectInternal cls |
-      receiver_type(attr, name, this, cls) and
+    exists(ClassObjectInternal cls |
+      receiver_type(_, name, this, cls) and
       cls_descriptor(cls, name, descriptor)
     ) and
     instance = this

python/ql/lib/semmle/python/objects/ObjectAPI.qll

@@ -674,7 +674,7 @@ abstract class FunctionValue extends CallableValue {
   /** Gets the maximum number of parameters that can be correctly passed to this function */
   abstract int maxParameters();
 
-  predicate isOverridingMethod() { exists(Value f | this.overrides(f)) }
+  predicate isOverridingMethod() { this.overrides(_) }
 
   predicate isOverriddenMethod() { exists(Value f | f.overrides(this)) }
 

python/ql/lib/semmle/python/pointsto/PointsTo.qll

@@ -1026,8 +1026,8 @@ module InterProceduralPointsTo {
     ParameterDefinition def, PointsToContext context, ObjectInternal value, ControlFlowNode origin
   ) {
     def.isSelf() and
-    exists(CallNode call, BoundMethodObjectInternal method, Function func, PointsToContext caller |
-      callWithContext(call, caller, method, context) and
+    exists(BoundMethodObjectInternal method, Function func |
+      callWithContext(_, _, method, context) and
       func = method.getScope() and
       def.getScope() = func and
       value = method.getSelf() and
@@ -1062,8 +1062,8 @@ module InterProceduralPointsTo {
   private predicate context_for_default_value(ParameterDefinition def, PointsToContext context) {
     context.isRuntime() and exists(def)
     or
-    exists(PointsToContext caller, CallNode call, PythonFunctionObjectInternal func, int n |
-      context.fromCall(call, func, caller) and
+    exists(CallNode call, PythonFunctionObjectInternal func, int n |
+      context.fromCall(call, func, _) and
       func.getScope().getArg(n) = def.getParameter() and
       not exists(call.getArg(n)) and
       not exists(call.getArgByName(def.getVariable().getName())) and
@@ -1184,9 +1184,7 @@ module InterProceduralPointsTo {
     PointsToContext callee
   ) {
     PointsToInternal::pointsTo(argument, caller, _, _) and
-    exists(CallNode call, Function func, int offset |
-      callsite_calls_function(call, caller, func, callee, offset)
-    |
+    exists(CallNode call, Function func | callsite_calls_function(call, caller, func, callee, _) |
       exists(string name |
         argument = call.getArgByName(name) and
         function_parameter_name(func, param, name)
@@ -1460,10 +1458,9 @@ module Expressions {
     SubscriptNode subscr, PointsToContext context, ObjectInternal value, ControlFlowNode obj,
     ObjectInternal objvalue
   ) {
-    exists(ControlFlowNode index | subscriptObjectAndIndex(subscr, context, obj, objvalue, index) |
-      objvalue.subscriptUnknown() and
-      value = ObjectInternal::unknown()
-    )
+    subscriptObjectAndIndex(subscr, context, obj, objvalue, _) and
+    objvalue.subscriptUnknown() and
+    value = ObjectInternal::unknown()
     or
     exists(int n |
       subscriptObjectAndIndexPointsToInt(subscr, context, obj, objvalue, n) and
@@ -1567,9 +1564,9 @@ module Expressions {
       b.operands(other, op, operand)
     |
       op instanceof BitOr and
-      exists(ObjectInternal obj, int i1, int i2 |
+      exists(int i1, int i2 |
         pointsToInt(operand, context, opvalue, i1) and
-        pointsToInt(other, context, obj, i2) and
+        pointsToInt(other, context, _, i2) and
         value = TInt(i1.bitOr(i2))
       )
     )
@@ -2071,7 +2068,7 @@ module Expressions {
     exists(ObjectInternal sup_or_tuple |
       issubclass_call(_, _, _, sub, sup_or_tuple) and sub.isClass() = true
       or
-      exists(ObjectInternal val | isinstance_call(_, _, _, val, sub, sup_or_tuple))
+      isinstance_call(_, _, _, _, sub, sup_or_tuple)
     |
       sup = sup_or_tuple
       or
@@ -2759,8 +2756,8 @@ module ModuleAttributes {
     )
     or
     /* Retain value held before import */
-    exists(ModuleObjectInternal mod, EssaVariable input |
-      importStarDef(def, input, mod) and
+    exists(ModuleObjectInternal mod |
+      importStarDef(def, _, mod) and
       (InterModulePointsTo::moduleExportsBoolean(mod, name) = false or name.charAt(0) = "_") and
       attributePointsTo(def.getInput(), name, value, origin)
     )
@@ -2787,8 +2784,8 @@ module ModuleAttributes {
     CallsiteRefinement def, string name, ObjectInternal value, CfgOrigin origin
   ) {
     def.getVariable().isMetaVariable() and
-    exists(EssaVariable var, Function func, PointsToContext callee |
-      InterProceduralPointsTo::callsite_calls_function(def.getCall(), _, func, callee, _) and
+    exists(EssaVariable var, Function func |
+      InterProceduralPointsTo::callsite_calls_function(def.getCall(), _, func, _, _) and
       var = moduleStateVariable(func.getANormalExit()) and
       attributePointsTo(var, name, value, origin)
     )

python/ql/lib/semmle/python/regex.qll

@@ -994,10 +994,8 @@ abstract class RegexString extends Expr {
       this.specialCharacter(end, y, ["$", "\\Z"])
     )
     or
-    exists(int x |
-      this.lastPart(x, end) and
-      this.item(start, end)
-    )
+    this.lastPart(_, end) and
+    this.item(start, end)
     or
     exists(int y | this.lastPart(start, y) | this.qualifiedPart(start, end, y, _, _))
     or

python/ql/lib/semmle/python/types/FunctionObject.qll

@@ -10,7 +10,7 @@ private import semmle.python.types.Builtins
 abstract class FunctionObject extends Object {
   CallableValue theCallable() { result.(ObjectInternal).getSource() = this }
 
-  predicate isOverridingMethod() { exists(Object f | this.overrides(f)) }
+  predicate isOverridingMethod() { this.overrides(_) }
 
   predicate isOverriddenMethod() { exists(Object f | f.overrides(this)) }
 

python/ql/lib/semmle/python/web/turbogears/TurboGears.qll

@@ -28,10 +28,10 @@ deprecated class TurboGearsControllerMethod extends Function {
   predicate isTemplated() { exists(this.templateName()) }
 
   Dict getValidationDict() {
-    exists(Call call, Value dict |
+    exists(Call call |
       call = this.getADecorator() and
       call.getFunc().(Name).getId() = "validate" and
-      call.getArg(0).pointsTo(dict, result)
+      call.getArg(0).pointsTo(_, result)
     )
   }
 }

python/ql/src/Expressions/WrongNumberArgumentsForFormat.ql

@@ -17,15 +17,15 @@ import semmle.python.strings
 
 predicate string_format(BinaryExpr operation, StrConst str, Value args, AstNode origin) {
   operation.getOp() instanceof Mod and
-  exists(Value fmt, Context ctx |
-    operation.getLeft().pointsTo(ctx, fmt, str) and
+  exists(Context ctx |
+    operation.getLeft().pointsTo(ctx, _, str) and
     operation.getRight().pointsTo(ctx, args, origin)
   )
 }
 
 int sequence_length(Value args) {
   /* Guess length of sequence */
-  exists(Tuple seq, AstNode origin | seq.pointsTo(args, origin) |
+  exists(Tuple seq | seq.pointsTo(args, _) |
     result = strictcount(seq.getAnElt()) and
     not seq.getAnElt() instanceof Starred
   )

python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll

@@ -87,12 +87,12 @@ class ExternalApiDataNode extends DataFlow::Node {
       not exists(cv.(CallableValue).getScope().getLocation().getFile().getRelativePath())
     ) and
     // Not already modeled as a taint step
-    not exists(DataFlow::Node next | TaintTrackingPrivate::defaultAdditionalTaintStep(this, next)) and
+    not TaintTrackingPrivate::defaultAdditionalTaintStep(this, _) and
     // for `list.append(x)`, we have a additional taint step from x -> [post] list.
     // Since we have modeled this explicitly, I don't see any cases where we would want to report this.
-    not exists(DataFlow::Node prev, DataFlow::PostUpdateNode post |
+    not exists(DataFlow::PostUpdateNode post |
       post.getPreUpdateNode() = this and
-      TaintTrackingPrivate::defaultAdditionalTaintStep(prev, post)
+      TaintTrackingPrivate::defaultAdditionalTaintStep(_, post)
     )
   }
 

python/ql/src/Statements/StatementNoEffect.ql

@@ -22,8 +22,8 @@ predicate understood_attribute(Attribute attr, ClassValue cls, ClassValue attr_c
 
 /* Conservative estimate of whether attribute lookup has a side effect */
 predicate side_effecting_attribute(Attribute attr) {
-  exists(ClassValue cls, ClassValue attr_cls |
-    understood_attribute(attr, cls, attr_cls) and
+  exists(ClassValue attr_cls |
+    understood_attribute(attr, _, attr_cls) and
     side_effecting_descriptor_type(attr_cls)
   )
 }

python/ql/src/analysis/Consistency.ql

@@ -231,8 +231,8 @@ predicate points_to_consistency(string clsname, string problem, string what) {
     what = obj.toString()
   )
   or
-  exists(ControlFlowNode use, ControlFlowNode inter, Object obj |
-    intermediate_origins(use, inter, obj) and
+  exists(ControlFlowNode use, ControlFlowNode inter |
+    intermediate_origins(use, inter, _) and
     clsname = use.getAQlClass() and
     problem = "has intermediate origin " + inter and
     what = use.toString()

python/ql/src/analysis/TypeInferenceFailure.ql

@@ -12,5 +12,5 @@ import python
 from ControlFlowNode f, Object o
 where
   f.refersTo(o) and
-  not exists(ClassObject c | f.refersTo(o, c, _))
+  not f.refersTo(o, _, _)
 select o, "Type inference fails for 'object'."

python/ql/src/external/VCS.qll

@@ -33,7 +33,7 @@ class Commit extends @svnentry {
 
   File getAnAffectedFile(string action) { svnaffectedfiles(this, result, action) }
 
-  File getAnAffectedFile() { exists(string action | result = this.getAnAffectedFile(action)) }
+  File getAnAffectedFile() { result = this.getAnAffectedFile(_) }
 
   predicate isRecent() { recentCommit(this) }
 

python/ql/test/experimental/dataflow/TestUtil/MaximalFlowTest.qll

@@ -29,7 +29,7 @@ class MaximalFlowsConfig extends DataFlow::Configuration {
     not node instanceof DataFlow::PostUpdateNode and
     // not node.asExpr() instanceof FunctionExpr and
     // not node.asExpr() instanceof ClassExpr and
-    not exists(DataFlow::Node pred | DataFlow::localFlowStep(pred, node))
+    not DataFlow::localFlowStep(_, node)
   }
 
   override predicate isSink(DataFlow::Node node) {
@@ -37,6 +37,6 @@ class MaximalFlowsConfig extends DataFlow::Configuration {
     not any(CallNode c).getArg(_) = node.asCfgNode() and
     not node instanceof DataFlow::ArgumentNode and
     not node.asCfgNode().(NameNode).getId().matches("SINK%") and
-    not exists(DataFlow::Node succ | DataFlow::localFlowStep(node, succ))
+    not DataFlow::localFlowStep(node, _)
   }
 }

python/ql/test/experimental/dataflow/variable-capture/CaptureTest.ql

@@ -9,9 +9,7 @@ class CaptureTest extends InlineExpectationsTest {
   override string getARelevantTag() { result = "captured" }
 
   override predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(DataFlow::Node source, DataFlow::Node sink |
-      exists(TestConfiguration cfg | cfg.hasFlow(source, sink))
-    |
+    exists(DataFlow::Node sink | exists(TestConfiguration cfg | cfg.hasFlowTo(sink)) |
       location = sink.getLocation() and
       tag = "captured" and
       value = "" and

python/ql/test/library-tests/ApiGraphs/py2/use.ql

@@ -13,7 +13,7 @@ class ApiUseTest extends InlineExpectationsTest {
   }
 
   override predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(API::Node a, DataFlow::Node n | relevant_node(a, n, location) |
+    exists(DataFlow::Node n | relevant_node(_, n, location) |
       tag = "use" and
       // Only report the longest path on this line:
       value =