diff --git a/src/coreclr/scripts/superpmi.py b/src/coreclr/scripts/superpmi.py
index 377af07e0a9d0..12be260c67a91 100755
--- a/src/coreclr/scripts/superpmi.py
+++ b/src/coreclr/scripts/superpmi.py
@@ -860,7 +860,8 @@ def replay(self):
             altjit_string = "*" if self.coreclr_args.altjit else ""
             altjit_flags = [
                 "-jitoption", "force", "AltJit=" + altjit_string,
-                "-jitoption", "force", "AltJitNgen=" + altjit_string
+                "-jitoption", "force", "AltJitNgen=" + altjit_string,
+                "-jitoption", "force", "EnableExtraSuperPmiQueries=0"
             ]
             flags += altjit_flags
 
@@ -1032,8 +1033,10 @@ def replay_with_asm_diffs(self):
                 altjit_flags = [
                     "-jitoption", "force", "AltJit=" + altjit_string,
                     "-jitoption", "force", "AltJitNgen=" + altjit_string,
+                    "-jitoption", "force", "EnableExtraSuperPmiQueries=0",
                     "-jit2option", "force", "AltJit=" + altjit_string,
-                    "-jit2option", "force", "AltJitNgen=" + altjit_string
+                    "-jit2option", "force", "AltJitNgen=" + altjit_string,
+                    "-jit2option", "force", "EnableExtraSuperPmiQueries=0"
                 ]
                 flags += altjit_flags
 
@@ -1208,7 +1211,8 @@ def replay_with_asm_diffs(self):
                 altjit_string = "*" if self.coreclr_args.altjit else ""
                 altjit_flags = [
                     "-jitoption", "force", "AltJit=" + altjit_string,
-                    "-jitoption", "force", "AltJitNgen=" + altjit_string
+                    "-jitoption", "force", "AltJitNgen=" + altjit_string,
+                    "-jitoption", "force", "EnableExtraSuperPmiQueries=0"
                 ]
 
                 async def create_asm(print_prefix, item, self, text_differences, base_asm_location, diff_asm_location):
diff --git a/src/coreclr/src/jit/morph.cpp b/src/coreclr/src/jit/morph.cpp
index d5cf8a892395d..61ad9937b0486 100644
--- a/src/coreclr/src/jit/morph.cpp
+++ b/src/coreclr/src/jit/morph.cpp
@@ -8946,7 +8946,7 @@ GenTree* Compiler::fgMorphCall(GenTreeCall* call)
 
         GenTree* dest = call->gtCallArgs->GetNode();
         assert(dest->OperGet() != GT_ARGPLACE); // If it was, we'd be in a remorph, which we've already excluded above.
-        if (dest->gtType == TYP_BYREF && !(dest->OperGet() == GT_ADDR && dest->AsOp()->gtOp1->OperGet() == GT_LCL_VAR))
+        if (dest->TypeIs(TYP_BYREF) && !dest->IsLocalAddrExpr())
         {
             // We'll exempt helper calls from this, assuming that the helper implementation
             // follows the old convention, and does whatever barrier is required.