@@ -1,26 +1,33 @@
-import python
+/**
+ * Provides consistency queries for checking invariants in the language-specific
+ * data-flow classes and predicates.
+ */
+
+private import python
 import semmle.python.dataflow.new.DataFlow::DataFlow
-import semmle.python.dataflow.new.internal.DataFlowPrivate
-import semmle.python.dataflow.new.internal.DataFlowImplConsistency::Consistency
+private import semmle.python.dataflow.new.internal.DataFlowImplSpecific
+private import semmle.python.dataflow.new.internal.TaintTrackingImplSpecific
+private import codeql.dataflow.internal.DataFlowImplConsistency
+
+private module Input implements InputSig<PythonDataFlow> {
+  private import Private
+  private import Public
 
-private class MyConsistencyConfiguration extends ConsistencyConfiguration {
-  override predicate argHasPostUpdateExclude(ArgumentNode n) {
+  predicate argHasPostUpdateExclude(ArgumentNode n) {
     exists(ArgumentPosition apos | n.argumentOf(_, apos) and apos.isStarArgs(_))
     or
     exists(ArgumentPosition apos | n.argumentOf(_, apos) and apos.isDictSplat())
   }
 
-  override predicate reverseReadExclude(Node n) {
+  predicate reverseReadExclude(Node n) {
     // since `self`/`cls` parameters can be marked as implicit argument to `super()`,
     // they will have PostUpdateNodes. We have a read-step from the synthetic `**kwargs`
     // parameter, but dataflow-consistency queries should _not_ complain about there not
     // being a post-update node for the synthetic `**kwargs` parameter.
     n instanceof SynthDictSplatParameterNode
   }
 
-  override predicate uniqueParameterNodePositionExclude(
-    DataFlowCallable c, ParameterPosition pos, Node p
-  ) {
+  predicate uniqueParameterNodePositionExclude(DataFlowCallable c, ParameterPosition pos, Node p) {
     // For normal parameters that can both be passed as positional arguments or keyword
     // arguments, we currently have parameter positions for both cases..
     //
@@ -34,11 +41,17 @@ private class MyConsistencyConfiguration extends ConsistencyConfiguration {
     )
   }
 
-  override predicate uniqueCallEnclosingCallableExclude(DataFlowCall call) {
+  predicate uniqueCallEnclosingCallableExclude(DataFlowCall call) {
     not exists(call.getLocation().getFile().getRelativePath())
   }
 
-  override predicate identityLocalStepExclude(Node n) {
+  predicate identityLocalStepExclude(Node n) {
     not exists(n.getLocation().getFile().getRelativePath())
   }
+
+  predicate multipleArgumentCallExclude(ArgumentNode arg, DataFlowCall call) {
+    isArgumentNode(arg, call, _)
+  }
 }
+
+import MakeConsistency<PythonDataFlow, PythonTaintTracking, Input>