diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll
index 6d5c60cafe6..54f41545284 100644
--- a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll
+++ b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll
@@ -422,10 +422,10 @@ private module Cached {
    * interface.
    */
   cached
-  predicate reverseStepThroughInputOutputAlias(Node fromNode, Node toNode) {
+  predicate reverseStepThroughInputOutputAlias(PostUpdateNode fromNode, PostUpdateNode toNode) {
     exists(Node fromPre, Node toPre |
-      fromPre = fromNode.(PostUpdateNode).getPreUpdateNode() and
-      toPre = toNode.(PostUpdateNode).getPreUpdateNode()
+      fromPre = fromNode.getPreUpdateNode() and
+      toPre = toNode.getPreUpdateNode()
     |
       exists(DataFlowCall c |
         // Does the language-specific simpleLocalFlowStep already model flow
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll
index 6d5c60cafe6..54f41545284 100644
--- a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll
+++ b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll
@@ -422,10 +422,10 @@ private module Cached {
    * interface.
    */
   cached
-  predicate reverseStepThroughInputOutputAlias(Node fromNode, Node toNode) {
+  predicate reverseStepThroughInputOutputAlias(PostUpdateNode fromNode, PostUpdateNode toNode) {
     exists(Node fromPre, Node toPre |
-      fromPre = fromNode.(PostUpdateNode).getPreUpdateNode() and
-      toPre = toNode.(PostUpdateNode).getPreUpdateNode()
+      fromPre = fromNode.getPreUpdateNode() and
+      toPre = toNode.getPreUpdateNode()
     |
       exists(DataFlowCall c |
         // Does the language-specific simpleLocalFlowStep already model flow
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll
index 6d5c60cafe6..54f41545284 100644
--- a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll
+++ b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll
@@ -422,10 +422,10 @@ private module Cached {
    * interface.
    */
   cached
-  predicate reverseStepThroughInputOutputAlias(Node fromNode, Node toNode) {
+  predicate reverseStepThroughInputOutputAlias(PostUpdateNode fromNode, PostUpdateNode toNode) {
     exists(Node fromPre, Node toPre |
-      fromPre = fromNode.(PostUpdateNode).getPreUpdateNode() and
-      toPre = toNode.(PostUpdateNode).getPreUpdateNode()
+      fromPre = fromNode.getPreUpdateNode() and
+      toPre = toNode.getPreUpdateNode()
     |
       exists(DataFlowCall c |
         // Does the language-specific simpleLocalFlowStep already model flow
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll
index 6d5c60cafe6..54f41545284 100644
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll
@@ -422,10 +422,10 @@ private module Cached {
    * interface.
    */
   cached
-  predicate reverseStepThroughInputOutputAlias(Node fromNode, Node toNode) {
+  predicate reverseStepThroughInputOutputAlias(PostUpdateNode fromNode, PostUpdateNode toNode) {
     exists(Node fromPre, Node toPre |
-      fromPre = fromNode.(PostUpdateNode).getPreUpdateNode() and
-      toPre = toNode.(PostUpdateNode).getPreUpdateNode()
+      fromPre = fromNode.getPreUpdateNode() and
+      toPre = toNode.getPreUpdateNode()
     |
       exists(DataFlowCall c |
         // Does the language-specific simpleLocalFlowStep already model flow
diff --git a/python/ql/src/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll b/python/ql/src/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll
index 6d5c60cafe6..54f41545284 100644
--- a/python/ql/src/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll
+++ b/python/ql/src/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll
@@ -422,10 +422,10 @@ private module Cached {
    * interface.
    */
   cached
-  predicate reverseStepThroughInputOutputAlias(Node fromNode, Node toNode) {
+  predicate reverseStepThroughInputOutputAlias(PostUpdateNode fromNode, PostUpdateNode toNode) {
     exists(Node fromPre, Node toPre |
-      fromPre = fromNode.(PostUpdateNode).getPreUpdateNode() and
-      toPre = toNode.(PostUpdateNode).getPreUpdateNode()
+      fromPre = fromNode.getPreUpdateNode() and
+      toPre = toNode.getPreUpdateNode()
     |
       exists(DataFlowCall c |
         // Does the language-specific simpleLocalFlowStep already model flow