diff --git a/powershell/ql/consistency-queries/DataFlowConsistency.ql b/powershell/ql/consistency-queries/DataFlowConsistency.ql
new file mode 100644
index 000000000000..224a5f835c3e
--- /dev/null
+++ b/powershell/ql/consistency-queries/DataFlowConsistency.ql
@@ -0,0 +1,11 @@
+import semmle.code.powershell.dataflow.DataFlow::DataFlow as DataFlow
+private import powershell
+private import semmle.code.powershell.dataflow.internal.DataFlowImplSpecific
+private import semmle.code.powershell.dataflow.internal.TaintTrackingImplSpecific
+private import codeql.dataflow.internal.DataFlowImplConsistency
+
+private module Input implements InputSig<Location, PowershellDataFlow> {
+  private import PowershellDataFlow
+}
+
+import MakeConsistency<Location, PowershellDataFlow, PowershellTaintTracking, Input>
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPrivate.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPrivate.qll
index 45560ae37f54..64602fbdaa5c 100644
--- a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPrivate.qll
+++ b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/DataFlowPrivate.qll
@@ -34,7 +34,7 @@ abstract class NodeImpl extends Node {
 }
 
 private class ExprNodeImpl extends ExprNode, NodeImpl {
-  override CfgScope getCfgScope() { none() /* TODO */ }
+  override CfgScope getCfgScope() { result = this.getExprNode().getExpr().getEnclosingScope() }
 
   override Location getLocationImpl() { result = this.getExprNode().getLocation() }
 
@@ -42,7 +42,7 @@ private class ExprNodeImpl extends ExprNode, NodeImpl {
 }
 
 private class StmtNodeImpl extends StmtNode, NodeImpl {
-  override CfgScope getCfgScope() { none() /* TODO */ }
+  override CfgScope getCfgScope() { result = this.getStmtNode().getStmt().getEnclosingScope() }
 
   override Location getLocationImpl() { result = this.getStmtNode().getLocation() }
 
@@ -69,7 +69,9 @@ module SsaFlow {
   Impl::Node asNode(Node n) {
     n = TSsaNode(result)
     or
-    result.(Impl::ExprNode).getExpr() = n.asExpr() // TODO: Statement nodes?
+    result.(Impl::ExprNode).getExpr() = n.asExpr()
+    or
+    result.(Impl::ExprNode).getExpr() = n.asStmt()
     or
     result.(Impl::ExprPostUpdateNode).getExpr() = n.(PostUpdateNode).getPreUpdateNode().asExpr()
     or
@@ -371,7 +373,8 @@ private module ParameterNodes {
     override Parameter getParameter() { result = parameter }
 
     override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
-      exists(CfgScope callable | callable = c.asCfgScope() |
+      parameter.getDeclaringScope() = c.asCfgScope() and
+      (
         pos.isKeyword(parameter.getName())
         or
         // Given a function f with parameters x, y we map
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/SsaImpl.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/SsaImpl.qll
index 4148bc2a2ac5..42d4b8433bd2 100644
--- a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/SsaImpl.qll
+++ b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/SsaImpl.qll
@@ -344,7 +344,7 @@ class ParameterExt extends TParameterExt {
 private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInputSig {
   class Parameter = ParameterExt;
 
-  class Expr extends Cfg::CfgNodes::ExprCfgNode {
+  class Expr extends Cfg::CfgNodes::AstCfgNode {
     predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { this = bb.getNode(i) }
   }