diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation_Groovy____3.txt b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation_Groovy____3.txt
index 50a2e480b4..a1027835f7 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation_Groovy____3.txt
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation_Groovy____3.txt
@@ -41,12 +41,8 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
     ALOAD 3
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    LDC Lorg/spockframework/runtime/SpecificationContext;.class
-    INVOKESTATIC org/codehaus/groovy/runtime/ScriptBytecodeAdapter.castToType (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;
-    CHECKCAST org/spockframework/runtime/SpecificationContext
     ICONST_0
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
    L0
@@ -97,21 +93,13 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
    L13
    FRAME SAME
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    LDC Lorg/spockframework/runtime/SpecificationContext;.class
-    INVOKESTATIC org/codehaus/groovy/runtime/ScriptBytecodeAdapter.castToType (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;
-    CHECKCAST org/spockframework/runtime/SpecificationContext
     ICONST_0
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    LDC Lorg/spockframework/runtime/SpecificationContext;.class
-    INVOKESTATIC org/codehaus/groovy/runtime/ScriptBytecodeAdapter.castToType (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;
-    CHECKCAST org/spockframework/runtime/SpecificationContext
     ICONST_1
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
@@ -158,21 +146,13 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
    L16
    FRAME SAME
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    LDC Lorg/spockframework/runtime/SpecificationContext;.class
-    INVOKESTATIC org/codehaus/groovy/runtime/ScriptBytecodeAdapter.castToType (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;
-    CHECKCAST org/spockframework/runtime/SpecificationContext
     ICONST_1
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    LDC Lorg/spockframework/runtime/SpecificationContext;.class
-    INVOKESTATIC org/codehaus/groovy/runtime/ScriptBytecodeAdapter.castToType (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;
-    CHECKCAST org/spockframework/runtime/SpecificationContext
     ICONST_2
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
    L17
@@ -187,12 +167,8 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
     INVOKEINTERFACE org/codehaus/groovy/runtime/callsite/CallSite.callCurrent (Lgroovy/lang/GroovyObject;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; (itf)
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    LDC Lorg/spockframework/runtime/SpecificationContext;.class
-    INVOKESTATIC org/codehaus/groovy/runtime/ScriptBytecodeAdapter.castToType (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;
-    CHECKCAST org/spockframework/runtime/SpecificationContext
     ICONST_2
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation_Groovy____4.txt b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation_Groovy____4.txt
index 0887d0dff6..4a58402510 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation_Groovy____4.txt
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation_Groovy____4.txt
@@ -52,16 +52,8 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
     ALOAD 2
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    INVOKEDYNAMIC cast(Lorg/spockframework/lang/ISpecificationContext;)Lorg/spockframework/runtime/SpecificationContext; [
-      // handle kind 0x6 : INVOKESTATIC
-      org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
-      // arguments:
-      "()", 
-      0
-    ]
     ICONST_0
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
    L0
@@ -112,29 +104,13 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
    L13
    FRAME SAME
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    INVOKEDYNAMIC cast(Lorg/spockframework/lang/ISpecificationContext;)Lorg/spockframework/runtime/SpecificationContext; [
-      // handle kind 0x6 : INVOKESTATIC
-      org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
-      // arguments:
-      "()", 
-      0
-    ]
     ICONST_0
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    INVOKEDYNAMIC cast(Lorg/spockframework/lang/ISpecificationContext;)Lorg/spockframework/runtime/SpecificationContext; [
-      // handle kind 0x6 : INVOKESTATIC
-      org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
-      // arguments:
-      "()", 
-      0
-    ]
     ICONST_1
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
@@ -186,29 +162,13 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
    L16
    FRAME SAME
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    INVOKEDYNAMIC cast(Lorg/spockframework/lang/ISpecificationContext;)Lorg/spockframework/runtime/SpecificationContext; [
-      // handle kind 0x6 : INVOKESTATIC
-      org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
-      // arguments:
-      "()", 
-      0
-    ]
     ICONST_1
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    INVOKEDYNAMIC cast(Lorg/spockframework/lang/ISpecificationContext;)Lorg/spockframework/runtime/SpecificationContext; [
-      // handle kind 0x6 : INVOKESTATIC
-      org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
-      // arguments:
-      "()", 
-      0
-    ]
     ICONST_2
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
    L17
@@ -226,16 +186,8 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
     ]
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    INVOKEDYNAMIC cast(Lorg/spockframework/lang/ISpecificationContext;)Lorg/spockframework/runtime/SpecificationContext; [
-      // handle kind 0x6 : INVOKESTATIC
-      org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
-      // arguments:
-      "()", 
-      0
-    ]
     ICONST_2
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_can_render_everything.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_can_render_everything.groovy
index ce864b0430..7ffba1c2db 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_can_render_everything.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_can_render_everything.groovy
@@ -7,9 +7,9 @@ public class apackage.ASpec extends spock.lang.Specification {
 
     @org.spockframework.runtime.model.FeatureMetadata(name = 'a feature', ordinal = 0, line = 1, blocks = [@org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.SETUP, texts = [])], parameterNames = [])
     public void $spock_feature_0_0() {
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
         java.lang.Object nothing = null
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
         this.getSpecificationContext().getMockController().leaveScope()
     }
 
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_can_render_everything__Groovy_4_0_2__.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_can_render_everything__Groovy_4_0_2__.groovy
index 11ddc426bf..fd88bc3283 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_can_render_everything__Groovy_4_0_2__.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_can_render_everything__Groovy_4_0_2__.groovy
@@ -7,9 +7,9 @@ public class apackage.ASpec extends spock.lang.Specification implements groovy.l
 
     @org.spockframework.runtime.model.FeatureMetadata(name = 'a feature', ordinal = 0, line = 1, blocks = [@org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.SETUP, texts = [])], parameterNames = [])
     public void $spock_feature_0_0() {
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
         java.lang.Object nothing = null
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
         this.getSpecificationContext().getMockController().leaveScope()
     }
 
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_renders_only_methods_and_its_annotation_by_default.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_renders_only_methods_and_its_annotation_by_default.groovy
index a690ad70c0..dd6b84996a 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_renders_only_methods_and_its_annotation_by_default.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_renders_only_methods_and_its_annotation_by_default.groovy
@@ -6,9 +6,9 @@ class ASpec extends Specification {
 /*--------- tag::snapshot[] ---------*/
 @org.spockframework.runtime.model.FeatureMetadata(name = 'a feature', ordinal = 0, line = 1, blocks = [@org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.SETUP, texts = [])], parameterNames = [])
 public void $spock_feature_0_0() {
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     java.lang.Object nothing = null
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceSpecBody_renders_only_methods__fields__properties__object_initializers_and_their_annotation_by_default.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceSpecBody_renders_only_methods__fields__properties__object_initializers_and_their_annotation_by_default.groovy
index 31d9795be5..6e4e7d6fae 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceSpecBody_renders_only_methods__fields__properties__object_initializers_and_their_annotation_by_default.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/AstSpec/astToSourceSpecBody_renders_only_methods__fields__properties__object_initializers_and_their_annotation_by_default.groovy
@@ -12,9 +12,9 @@ private java.lang.Object $spock_initializeFields() {
 
 @org.spockframework.runtime.model.FeatureMetadata(name = 'a feature', ordinal = 0, line = 3, blocks = [@org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.SETUP, texts = [])], parameterNames = [])
 public void $spock_feature_0_0() {
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     java.lang.Object nothing = null
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_GString_labels.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_GString_labels.groovy
index 00650532dc..398e103783 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_GString_labels.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_GString_labels.groovy
@@ -9,10 +9,10 @@ public void $spock_feature_0_0() {
     org.spockframework.runtime.ErrorCollector $spock_errorCollector = org.spockframework.runtime.ErrorRethrower.INSTANCE
     org.spockframework.runtime.ValueRecorder $spock_valueRecorder = new org.spockframework.runtime.ValueRecorder()
     java.lang.Integer idx = 0
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     "given ${( idx )++}"
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
     try {
         org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), '\"expect \${idx++}\"', 3, 13, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(2), "${$spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), ( idx )++)}expect "))
     }
@@ -20,11 +20,11 @@ public void $spock_feature_0_0() {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, '\"expect \${idx++}\"', 3, 13, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 2)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 2)
     "when ${( idx )++}"
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 2)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 3)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 2)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 3)
     try {
         org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), '\"then \${idx++}\"', 5, 11, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(2), "${$spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), ( idx )++)}then "))
     }
@@ -32,7 +32,7 @@ public void $spock_feature_0_0() {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, '\"then \${idx++}\"', 5, 11, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 3)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 3)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_empty_labels.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_empty_labels.groovy
index bdf57f9c28..a8d52bacf0 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_empty_labels.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_empty_labels.groovy
@@ -8,14 +8,14 @@ class ASpec extends Specification {
 public void $spock_feature_0_0() {
     java.lang.Throwable $spock_feature_throwable
     try {
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 2)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 2)
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 3)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 3)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 2)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 2)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 3)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 3)
     }
     catch (java.lang.Throwable $spock_tmp_throwable) {
         $spock_feature_throwable = $spock_tmp_throwable
@@ -27,8 +27,8 @@ public void $spock_feature_0_0() {
             if ( $spock_feature_throwable != null) {
                 $spock_failedBlock = this.getSpecificationContext().getCurrentBlock()
             }
-            org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 4)
-            org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 4)
+            org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 4)
+            org.spockframework.runtime.SpockRuntime.callBlockExited(this, 4)
         }
         catch (java.lang.Throwable $spock_tmp_throwable) {
             if ( $spock_feature_throwable != null) {
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_labels_and_blocks.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_labels_and_blocks.groovy
index 69434818ef..a22c5e5f8a 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_labels_and_blocks.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_labels_and_blocks.groovy
@@ -8,16 +8,16 @@ class ASpec extends Specification {
 public void $spock_feature_0_0() {
     java.lang.Throwable $spock_feature_throwable
     try {
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 2)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 2)
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 3)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 3)
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 4)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 4)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 2)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 2)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 3)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 3)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 4)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 4)
     }
     catch (java.lang.Throwable $spock_tmp_throwable) {
         $spock_feature_throwable = $spock_tmp_throwable
@@ -29,8 +29,8 @@ public void $spock_feature_0_0() {
             if ( $spock_feature_throwable != null) {
                 $spock_failedBlock = this.getSpecificationContext().getCurrentBlock()
             }
-            org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 5)
-            org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 5)
+            org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 5)
+            org.spockframework.runtime.SpockRuntime.callBlockExited(this, 5)
         }
         catch (java.lang.Throwable $spock_tmp_throwable) {
             if ( $spock_feature_throwable != null) {
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/CleanupBlocksAstSpec/cleanup_rewrite_keeps_correct_method_reference.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/CleanupBlocksAstSpec/cleanup_rewrite_keeps_correct_method_reference.groovy
index 12acd40e97..5c50479987 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/CleanupBlocksAstSpec/cleanup_rewrite_keeps_correct_method_reference.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/CleanupBlocksAstSpec/cleanup_rewrite_keeps_correct_method_reference.groovy
@@ -13,10 +13,10 @@ public void $spock_feature_0_0() {
     java.lang.Object foobar
     java.lang.Throwable $spock_feature_throwable
     try {
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
         foobar = this.foobar()
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
         try {
             org.spockframework.runtime.SpockRuntime.verifyMethodCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'println(foobar)', 6, 3, null, this, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), 'println'), new java.lang.Object[]{$spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), foobar)}, $spock_valueRecorder.realizeNas(4, false), false, 3)
         }
@@ -24,7 +24,7 @@ public void $spock_feature_0_0() {
             org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'println(foobar)', 6, 3, null, $spock_condition_throwable)}
         finally {
         }
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
     }
     catch (java.lang.Throwable $spock_tmp_throwable) {
         $spock_feature_throwable = $spock_tmp_throwable
@@ -36,9 +36,9 @@ public void $spock_feature_0_0() {
             if ( $spock_feature_throwable != null) {
                 $spock_failedBlock = this.getSpecificationContext().getCurrentBlock()
             }
-            org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 2)
+            org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 2)
             foobar.size()
-            org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 2)
+            org.spockframework.runtime.SpockRuntime.callBlockExited(this, 2)
         }
         catch (java.lang.Throwable $spock_tmp_throwable) {
             if ( $spock_feature_throwable != null) {
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/CleanupBlocksAstSpec/cleanup_rewrite_keeps_correct_method_reference_for_multi_assignments.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/CleanupBlocksAstSpec/cleanup_rewrite_keeps_correct_method_reference_for_multi_assignments.groovy
index 9b4a45cfc3..66ebf79c64 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/CleanupBlocksAstSpec/cleanup_rewrite_keeps_correct_method_reference_for_multi_assignments.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/CleanupBlocksAstSpec/cleanup_rewrite_keeps_correct_method_reference_for_multi_assignments.groovy
@@ -13,10 +13,10 @@ public void $spock_feature_0_0() {
     def (java.lang.Object foobar, java.lang.Object b) = [null, null]
     java.lang.Throwable $spock_feature_throwable
     try {
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
         (foobar, b) = this.foobar()
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
         try {
             org.spockframework.runtime.SpockRuntime.verifyMethodCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'println(foobar)', 6, 3, null, this, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), 'println'), new java.lang.Object[]{$spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), foobar)}, $spock_valueRecorder.realizeNas(4, false), false, 3)
         }
@@ -24,7 +24,7 @@ public void $spock_feature_0_0() {
             org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'println(foobar)', 6, 3, null, $spock_condition_throwable)}
         finally {
         }
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
     }
     catch (java.lang.Throwable $spock_tmp_throwable) {
         $spock_feature_throwable = $spock_tmp_throwable
@@ -36,9 +36,9 @@ public void $spock_feature_0_0() {
             if ( $spock_feature_throwable != null) {
                 $spock_failedBlock = this.getSpecificationContext().getCurrentBlock()
             }
-            org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 2)
+            org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 2)
             foobar.size()
-            org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 2)
+            org.spockframework.runtime.SpockRuntime.callBlockExited(this, 2)
         }
         catch (java.lang.Throwable $spock_tmp_throwable) {
             if ( $spock_feature_throwable != null) {
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/multi_parameterization.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/multi_parameterization.groovy
index 201d1c5fd8..5f8070d8fd 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/multi_parameterization.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/multi_parameterization.groovy
@@ -8,7 +8,7 @@ class ASpec extends Specification {
 public void $spock_feature_0_0(java.lang.Object a, java.lang.Object b) {
     org.spockframework.runtime.ErrorCollector $spock_errorCollector = org.spockframework.runtime.ErrorRethrower.INSTANCE
     org.spockframework.runtime.ValueRecorder $spock_valueRecorder = new org.spockframework.runtime.ValueRecorder()
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     try {
         org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'a == b', 1, 83, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(2), $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), a) == $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), b)))
     }
@@ -16,7 +16,7 @@ public void $spock_feature_0_0(java.lang.Object a, java.lang.Object b) {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'a == b', 1, 83, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/nested_multi_parameterization.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/nested_multi_parameterization.groovy
index 215215d6ce..8dfb9a8902 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/nested_multi_parameterization.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataAstSpec/nested_multi_parameterization.groovy
@@ -8,7 +8,7 @@ class ASpec extends Specification {
 public void $spock_feature_0_0(java.lang.Object a, java.lang.Object b) {
     org.spockframework.runtime.ErrorCollector $spock_errorCollector = org.spockframework.runtime.ErrorRethrower.INSTANCE
     org.spockframework.runtime.ValueRecorder $spock_valueRecorder = new org.spockframework.runtime.ValueRecorder()
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     try {
         org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'a == b', 1, 83, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(2), $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), a) == $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), b)))
     }
@@ -16,7 +16,7 @@ public void $spock_feature_0_0(java.lang.Object a, java.lang.Object b) {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'a == b', 1, 83, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/data_tables_with__separators_can_be_combined-[0].groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/data_tables_with__separators_can_be_combined-[0].groovy
index 3ad733861b..c958c492df 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/data_tables_with__separators_can_be_combined-[0].groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/data_tables_with__separators_can_be_combined-[0].groovy
@@ -7,7 +7,7 @@ class ASpec extends Specification {
 public void $spock_feature_0_0(java.lang.Object a, java.lang.Object b, java.lang.Object c) {
     org.spockframework.runtime.ErrorCollector $spock_errorCollector = org.spockframework.runtime.ErrorRethrower.INSTANCE
     org.spockframework.runtime.ValueRecorder $spock_valueRecorder = new org.spockframework.runtime.ValueRecorder()
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     try {
         org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'true', 2, 7, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), true))
     }
@@ -15,7 +15,7 @@ public void $spock_feature_0_0(java.lang.Object a, java.lang.Object b, java.lang
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'true', 2, 7, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/data_tables_with__separators_can_be_combined-[1].groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/data_tables_with__separators_can_be_combined-[1].groovy
index 3ad733861b..c958c492df 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/data_tables_with__separators_can_be_combined-[1].groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/data_tables_with__separators_can_be_combined-[1].groovy
@@ -7,7 +7,7 @@ class ASpec extends Specification {
 public void $spock_feature_0_0(java.lang.Object a, java.lang.Object b, java.lang.Object c) {
     org.spockframework.runtime.ErrorCollector $spock_errorCollector = org.spockframework.runtime.ErrorRethrower.INSTANCE
     org.spockframework.runtime.ValueRecorder $spock_valueRecorder = new org.spockframework.runtime.ValueRecorder()
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     try {
         org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'true', 2, 7, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), true))
     }
@@ -15,7 +15,7 @@ public void $spock_feature_0_0(java.lang.Object a, java.lang.Object b, java.lang
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'true', 2, 7, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/data_tables_with__separators_can_be_combined-[2].groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/data_tables_with__separators_can_be_combined-[2].groovy
index 3ad733861b..c958c492df 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/data_tables_with__separators_can_be_combined-[2].groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/data_tables_with__separators_can_be_combined-[2].groovy
@@ -7,7 +7,7 @@ class ASpec extends Specification {
 public void $spock_feature_0_0(java.lang.Object a, java.lang.Object b, java.lang.Object c) {
     org.spockframework.runtime.ErrorCollector $spock_errorCollector = org.spockframework.runtime.ErrorRethrower.INSTANCE
     org.spockframework.runtime.ValueRecorder $spock_valueRecorder = new org.spockframework.runtime.ValueRecorder()
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     try {
         org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'true', 2, 7, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), true))
     }
@@ -15,7 +15,7 @@ public void $spock_feature_0_0(java.lang.Object a, java.lang.Object b, java.lang
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'true', 2, 7, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/filter_block_becomes_its_own_method.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/filter_block_becomes_its_own_method.groovy
index eb157c19b4..5703093d13 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/filter_block_becomes_its_own_method.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/DataTablesAstSpec/filter_block_becomes_its_own_method.groovy
@@ -7,7 +7,7 @@ class ASpec extends Specification {
 public void $spock_feature_0_0(java.lang.Object a, java.lang.Object b) {
     org.spockframework.runtime.ErrorCollector $spock_errorCollector = org.spockframework.runtime.ErrorRethrower.INSTANCE
     org.spockframework.runtime.ValueRecorder $spock_valueRecorder = new org.spockframework.runtime.ValueRecorder()
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     try {
         org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'true', 2, 7, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), true))
     }
@@ -15,7 +15,7 @@ public void $spock_feature_0_0(java.lang.Object a, java.lang.Object b) {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'true', 2, 7, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/collection_condition_matchCollectionsAsSet_is_transformed_correctly.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/collection_condition_matchCollectionsAsSet_is_transformed_correctly.groovy
index e11a1a15e8..b1038ef214 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/collection_condition_matchCollectionsAsSet_is_transformed_correctly.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/collection_condition_matchCollectionsAsSet_is_transformed_correctly.groovy
@@ -8,10 +8,10 @@ class ASpec extends Specification {
 public void $spock_feature_0_0() {
     org.spockframework.runtime.ErrorCollector $spock_errorCollector = org.spockframework.runtime.ErrorRethrower.INSTANCE
     org.spockframework.runtime.ValueRecorder $spock_valueRecorder = new org.spockframework.runtime.ValueRecorder()
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     java.lang.Object x = [1]
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
     try {
         org.spockframework.runtime.SpockRuntime.verifyMethodCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'x =~ [1]', 4, 9, null, org.spockframework.runtime.SpockRuntime, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), 'matchCollectionsAsSet'), new java.lang.Object[]{$spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), x), $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(3), [$spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(2), 1)])}, $spock_valueRecorder.realizeNas(6, false), false, 5)
     }
@@ -19,7 +19,7 @@ public void $spock_feature_0_0() {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'x =~ [1]', 4, 9, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/collection_condition_matchCollectionsInAnyOrder_is_transformed_correctly.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/collection_condition_matchCollectionsInAnyOrder_is_transformed_correctly.groovy
index 6e11bd81a6..266ad18ba2 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/collection_condition_matchCollectionsInAnyOrder_is_transformed_correctly.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/collection_condition_matchCollectionsInAnyOrder_is_transformed_correctly.groovy
@@ -8,10 +8,10 @@ class ASpec extends Specification {
 public void $spock_feature_0_0() {
     org.spockframework.runtime.ErrorCollector $spock_errorCollector = org.spockframework.runtime.ErrorRethrower.INSTANCE
     org.spockframework.runtime.ValueRecorder $spock_valueRecorder = new org.spockframework.runtime.ValueRecorder()
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     java.lang.Object x = [1]
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
     try {
         org.spockframework.runtime.SpockRuntime.verifyMethodCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'x ==~ [1]', 4, 9, null, org.spockframework.runtime.SpockRuntime, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), 'matchCollectionsInAnyOrder'), new java.lang.Object[]{$spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), x), $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(3), [$spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(2), 1)])}, $spock_valueRecorder.realizeNas(6, false), false, 5)
     }
@@ -19,7 +19,7 @@ public void $spock_feature_0_0() {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'x ==~ [1]', 4, 9, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/regex_find_conditions_are_transformed_correctly.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/regex_find_conditions_are_transformed_correctly.groovy
index 00647881b6..a7702be146 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/regex_find_conditions_are_transformed_correctly.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/regex_find_conditions_are_transformed_correctly.groovy
@@ -8,10 +8,10 @@ class ASpec extends Specification {
 public void $spock_feature_0_0() {
     org.spockframework.runtime.ErrorCollector $spock_errorCollector = org.spockframework.runtime.ErrorRethrower.INSTANCE
     org.spockframework.runtime.ValueRecorder $spock_valueRecorder = new org.spockframework.runtime.ValueRecorder()
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     java.lang.Object x = '[1]'
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
     try {
         org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'x =~ /\\d/', 4, 9, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(2), org.spockframework.runtime.SpockRuntime.matchCollectionsAsSet($spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), x), $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), '\\d'))))
     }
@@ -19,7 +19,7 @@ public void $spock_feature_0_0() {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'x =~ /\\d/', 4, 9, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/regex_match_conditions_are_transformed_correctly.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/regex_match_conditions_are_transformed_correctly.groovy
index 4ce13e20d9..a095e0c2a3 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/regex_match_conditions_are_transformed_correctly.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/CollectionConditionAstSpec/regex_match_conditions_are_transformed_correctly.groovy
@@ -8,10 +8,10 @@ class ASpec extends Specification {
 public void $spock_feature_0_0() {
     org.spockframework.runtime.ErrorCollector $spock_errorCollector = org.spockframework.runtime.ErrorRethrower.INSTANCE
     org.spockframework.runtime.ValueRecorder $spock_valueRecorder = new org.spockframework.runtime.ValueRecorder()
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     java.lang.Object x = 'a1b'
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
     try {
         org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'x ==~ /a\\db/', 4, 9, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(2), org.spockframework.runtime.SpockRuntime.matchCollectionsInAnyOrder($spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), x), $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), 'a\\db'))))
     }
@@ -19,7 +19,7 @@ public void $spock_feature_0_0() {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'x ==~ /a\\db/', 4, 9, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/ExceptionConditionsAstSpec/thrown_rewrite_keeps_correct_method_reference.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/ExceptionConditionsAstSpec/thrown_rewrite_keeps_correct_method_reference.groovy
index 2a5315379b..8977bec80f 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/ExceptionConditionsAstSpec/thrown_rewrite_keeps_correct_method_reference.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/ExceptionConditionsAstSpec/thrown_rewrite_keeps_correct_method_reference.groovy
@@ -9,7 +9,7 @@ public java.lang.Object foobar() {
 
 public void $spock_feature_0_0() {
     java.lang.Object foobar
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     this.getSpecificationContext().setThrownException(null)
     try {
         foobar = this.foobar()
@@ -19,10 +19,10 @@ public void $spock_feature_0_0() {
     }
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
     this.thrownImpl(null, null, java.lang.IllegalStateException)
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/ExceptionConditionsAstSpec/thrown_rewrite_keeps_correct_method_reference_for_multi_assignments.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/ExceptionConditionsAstSpec/thrown_rewrite_keeps_correct_method_reference_for_multi_assignments.groovy
index 9a592abdd8..0a302a10ce 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/ExceptionConditionsAstSpec/thrown_rewrite_keeps_correct_method_reference_for_multi_assignments.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/ExceptionConditionsAstSpec/thrown_rewrite_keeps_correct_method_reference_for_multi_assignments.groovy
@@ -9,7 +9,7 @@ public java.lang.Object foobar() {
 
 public void $spock_feature_0_0() {
     def (java.lang.Object foobar, java.lang.Object b) = [null, null]
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     this.getSpecificationContext().setThrownException(null)
     try {
         (foobar, b) = this.foobar()
@@ -19,10 +19,10 @@ public void $spock_feature_0_0() {
     }
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
     this.thrownImpl(null, null, java.lang.IllegalStateException)
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/
diff --git a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/mock/MocksAstSpec/simple_interaction.groovy b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/mock/MocksAstSpec/simple_interaction.groovy
index 4a79964dc0..d1e0a23ccd 100644
--- a/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/mock/MocksAstSpec/simple_interaction.groovy
+++ b/spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/mock/MocksAstSpec/simple_interaction.groovy
@@ -6,17 +6,17 @@ class ASpec extends Specification {
 /*--------- tag::snapshot[] ---------*/
 @org.spockframework.runtime.model.FeatureMetadata(name = 'a feature', ordinal = 0, line = 1, blocks = [@org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.SETUP, texts = []), @org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.WHEN, texts = []), @org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.THEN, texts = [])], parameterNames = [])
 public void $spock_feature_0_0() {
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     java.util.List list = this.MockImpl('list', java.util.List)
     this.getSpecificationContext().getMockController().enterScope()
     this.getSpecificationContext().getMockController().addInteraction(new org.spockframework.mock.runtime.InteractionBuilder(8, 5, '1 * list.add(1)').setFixedCount(1).addEqualTarget(list).addEqualMethodName('add').setArgListKind(true, false).addEqualArg(1).build())
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
     list.add(1)
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 2)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 2)
     this.getSpecificationContext().getMockController().leaveScope()
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 2)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 2)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/