diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
index d96a4104d84..1f322a02201 100644
--- a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
+++ b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
index d96a4104d84..1f322a02201 100644
--- a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
+++ b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
index d96a4104d84..1f322a02201 100644
--- a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
+++ b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
index d96a4104d84..1f322a02201 100644
--- a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
+++ b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
index d96a4104d84..1f322a02201 100644
--- a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
+++ b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
index d96a4104d84..1f322a02201 100644
--- a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
+++ b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
index d96a4104d84..1f322a02201 100644
--- a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
+++ b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
index d96a4104d84..1f322a02201 100644
--- a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
+++ b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
index d96a4104d84..1f322a02201 100644
--- a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
+++ b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
index d96a4104d84..1f322a02201 100644
--- a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
+++ b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
index d96a4104d84..1f322a02201 100644
--- a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
+++ b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
index d96a4104d84..1f322a02201 100644
--- a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
+++ b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
index d96a4104d84..1f322a02201 100644
--- a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
+++ b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
index d96a4104d84..1f322a02201 100644
--- a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
+++ b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
index d96a4104d84..1f322a02201 100644
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
index d96a4104d84..1f322a02201 100644
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
index d96a4104d84..1f322a02201 100644
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
index d96a4104d84..1f322a02201 100644
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
index d96a4104d84..1f322a02201 100644
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowStore(ap0, f, node, toReturn, config) and
+    flowStore(node, f, toReturn, ap0, config) and
     pop(ap0, f, ap)
   )
   or
   exists(Content f, AccessPath ap0 |
-    flowRead(f, ap0, node, toReturn, config) and
+    flowRead(node, f, toReturn, ap0, config) and
     push(ap0, f, ap)
   )
 }
 
 pragma[nomagic]
 private predicate flowStore(
-  AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
 
 pragma[nomagic]
 private predicate flowRead(
-  Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
+  Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
 ) {
   exists(Node mid |
     read(node, f, mid) and