diff --git a/shared/rangeanalysis/codeql/rangeanalysis/ModulusAnalysis.qll b/shared/rangeanalysis/codeql/rangeanalysis/ModulusAnalysis.qll
index a94e81a942e..486347b284a 100644
--- a/shared/rangeanalysis/codeql/rangeanalysis/ModulusAnalysis.qll
+++ b/shared/rangeanalysis/codeql/rangeanalysis/ModulusAnalysis.qll
@@ -254,8 +254,7 @@ module ModulusAnalysis<
     or
     exists(Sem::SsaVariable v, SsaReadPositionBlock bb |
       ssaModulus(v, bb, b, val, mod) and
-      e = v.getAUse() and
-      bb.getBlock() = e.getBasicBlock()
+      bb.getAnSsaRead(v) = e
     )
     or
     exists(Sem::Expr mid, int val0, int delta |
diff --git a/shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll b/shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll
index d6ed5b5a58e..e8f2ef80a33 100644
--- a/shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll
+++ b/shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll
@@ -1167,8 +1167,7 @@ module RangeStage<
       or
       exists(Sem::SsaVariable v, SsaReadPositionBlock bb |
         boundedSsa(v, b, delta, bb, upper, fromBackEdge, origdelta, reason) and
-        e = v.getAUse() and
-        bb.getBlock() = e.getBasicBlock()
+        bb.getAnSsaRead(v) = e
       )
       or
       exists(Sem::Expr mid, D::Delta d1, D::Delta d2 |