diff --git a/.sizes.json b/.sizes.json
index f062ac2e4..2911f3ded 100644
--- a/.sizes.json
+++ b/.sizes.json
@@ -44,31 +44,31 @@
     {
       "name": "comments",
       "user": {
-        "min": 1165,
+        "min": 1172,
         "brotli": 641
       },
       "runtime": {
-        "min": 7476,
-        "brotli": 3096
+        "min": 7511,
+        "brotli": 3115
       },
       "total": {
-        "min": 8641,
-        "brotli": 3737
+        "min": 8683,
+        "brotli": 3756
       }
     },
     {
       "name": "comments 💧",
       "user": {
-        "min": 930,
-        "brotli": 537
+        "min": 932,
+        "brotli": 544
       },
       "runtime": {
-        "min": 7739,
-        "brotli": 3216
+        "min": 7908,
+        "brotli": 3275
       },
       "total": {
-        "min": 8669,
-        "brotli": 3753
+        "min": 8840,
+        "brotli": 3819
       }
     }
   ]
diff --git a/packages/runtime-tags/src/html/serializer.ts b/packages/runtime-tags/src/html/serializer.ts
index e238852de..df3608947 100644
--- a/packages/runtime-tags/src/html/serializer.ts
+++ b/packages/runtime-tags/src/html/serializer.ts
@@ -512,7 +512,7 @@ function writeRegistered(
       state.buf.push(access + "(" + scopeId + ")");
     } else {
       state.buf.push(access + "(");
-      writeProp(state, scope, null, "");
+      writeProp(state, scope, parent, "");
       const scopeRef = state.refs.get(scope);
       if (scopeRef) ensureId(state, scopeRef);
       state.buf.push(")");
diff --git a/packages/runtime-tags/src/html/writer.ts b/packages/runtime-tags/src/html/writer.ts
index 0d784ca4b..c429d9358 100644
--- a/packages/runtime-tags/src/html/writer.ts
+++ b/packages/runtime-tags/src/html/writer.ts
@@ -8,13 +8,14 @@ import {
 
 export { serializerRegister };
 
+const kScopeId = Symbol("scopeId");
 const runtimeId = ResumeSymbol.DefaultRuntimeId;
 const reorderRuntimeString = String(reorderRuntime).replace(
   "RUNTIME_ID",
   runtimeId,
 );
 
-type PartialScope = Record<string | number, unknown> | unknown[];
+type PartialScope = Record<PropertyKey, unknown> | unknown[];
 
 export interface Writable {
   write(data: string): void;
@@ -478,11 +479,7 @@ export function ensureScopeWithId(scopeId: number) {
   const scopeLookup = $_streamData!.scopeLookup;
   let scope = scopeLookup.get(scopeId);
   if (!scope) {
-    scope = {};
-    scopeLookup.set(scopeId, scope);
-    if (MARKO_DEBUG) {
-      (scope as any)["#scope"] = scopeId;
-    }
+    scopeLookup.set(scopeId, (scope = { [kScopeId]: scopeId }));
   }
 
   return scope;
@@ -502,7 +499,7 @@ export function getRegistryInfo(val: WeakKey) {
   const registered = getRegistered(val);
   if (registered) {
     return registered.scope
-      ? [registered.id, getRegistered(registered.scope)?.id]
+      ? [registered.id, (registered.scope as any)[kScopeId]]
       : [registered.id];
   }
 }
@@ -520,9 +517,7 @@ export function writeScope(
     | undefined = $_streamData!.scopeLookup.get(scopeId),
 ) {
   if (assignTo === undefined) {
-    if (MARKO_DEBUG) {
-      (scope as any)["#scope"] = scopeId;
-    }
+    (scope as any)[kScopeId] = scopeId;
     $_streamData!.scopeLookup.set(scopeId, scope);
   } else if (assignTo !== scope) {
     if (Array.isArray(assignTo)) {
diff --git a/packages/translator-interop/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
index afe9ca1c8..63ba9a76c 100644
--- a/packages/translator-interop/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button class=inc>1<!M*0 #text/1>,<!>10<!M*0 #text/2></button><!M*0 #button/0><!M[1><div>Counts: 1,10</div><!M]0 #text/3><script>(M$h=[]).push(_=>(_.b={0:{x:1,y:10,"#text/3!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/custom-tag-parameters-from-args/components/custom-tag.marko_0_x_y",])</script>
+  <button class=inc>1<!M*0 #text/1>,<!>10<!M*0 #text/2></button><!M*0 #button/0><!M[1><div>Counts: 1,10</div><!M]0 #text/3><script>(M$h=[]).push(_=>(_.b={0:{x:1,y:10,"#text/3!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/custom-tag-parameters-from-args/components/custom-tag.marko_0_x_y",])</script>
 
 
 # Render "End"
@@ -24,7 +24,7 @@
     </div>
     <!--M]0 #text/3-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{x:1,y:10,"#text/3!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/custom-tag-parameters-from-args/components/custom-tag.marko_0_x_y",])
+      (M$h=[]).push(_=&gt;(_.b={0:{x:1,y:10,"#text/3!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/custom-tag-parameters-from-args/components/custom-tag.marko_0_x_y",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/__snapshots__/resume.expected.md
index 34d65e4ae..f5a8b1166 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/__snapshots__/resume.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/__snapshots__/resume.expected.md
@@ -17,7 +17,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-1":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/template.marko"]})
@@ -65,7 +65,7 @@ container.querySelector("#tags").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-1":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/template.marko"]})
@@ -101,7 +101,7 @@ container.querySelector("#class").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-1":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/template.marko"]})
@@ -138,7 +138,7 @@ container.querySelector("#tags").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-1":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/template.marko"]})
@@ -174,7 +174,7 @@ container.querySelector("#class").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-1":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/template.marko"]})
@@ -211,7 +211,7 @@ container.querySelector("#tags").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-1":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/template.marko"]})
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/__snapshots__/ssr.expected.md
index 531d6be17..356f114cd 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/__snapshots__/ssr.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!--M#s0--><button id=class>0</button><!--F#1--><button id=tags data-parent=0>0<!M*0 #text/1></button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])</script><!--F/--><!--M/--><script>$MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-1":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/template.marko"]})</script>
+  <!--M#s0--><button id=class>0</button><!--F#1--><button id=tags data-parent=0>0<!M*0 #text/1></button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{count:0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])</script><!--F/--><!--M/--><script>$MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-1":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/template.marko"]})</script>
 
 
 # Render "End"
@@ -23,7 +23,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/components/tags-counter.marko_0_count",])
     </script>
     <!--F/-->
     <!--M/-->
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/__snapshots__/resume.expected.md
index 07ab92402..0d1b8196d 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/__snapshots__/resume.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/__snapshots__/resume.expected.md
@@ -22,7 +22,7 @@
     </script>
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1,m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"]),"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"])},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -63,7 +63,7 @@ container.querySelector("#tags").click()
     </script>
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1,m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"]),"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"])},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -102,7 +102,7 @@ container.querySelector("#class").click()
     </script>
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1,m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"]),"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"])},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -140,7 +140,7 @@ container.querySelector("#tags").click()
     </script>
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1,m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"]),"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"])},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -179,7 +179,7 @@ container.querySelector("#class").click()
     </script>
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1,m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"]),"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"])},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -217,7 +217,7 @@ container.querySelector("#tags").click()
     </script>
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1,m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"]),"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"])},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/__snapshots__/ssr.expected.md
index b22edc119..3d05f1b01 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/__snapshots__/ssr.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button id=tags>0<!M*0 #text/1></button><!M*0 #button/0><!M[1><!--M#s0--><button id=class data-parent=0>0</button><!--M/--><script>$MC=(window.$MC||[]).concat({"w":[["s0",0,{"count":0},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"]})</script><!M]0 #text/2><script>(M$h=[]).push(_=>(_.b={0:{count:0,"#text/2!":_.a={"#scope":1,m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"]),"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])</script>
+  <button id=tags>0<!M*0 #text/1></button><!M*0 #button/0><!M[1><!--M#s0--><button id=class data-parent=0>0</button><!--M/--><script>$MC=(window.$MC||[]).concat({"w":[["s0",0,{"count":0},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"]})</script><!M]0 #text/2><script>(M$h=[]).push(_=>(_.b={0:{count:0,"#text/2!":_.a={m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"])},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])</script>
 
 
 # Render "End"
@@ -28,7 +28,7 @@
     </script>
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1,m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"]),"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={m5c:"s0"},"#text/2(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/components/class-counter.marko"])},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/__snapshots__/resume.expected.md
index e4c347799..943b10e40 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/__snapshots__/resume.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/__snapshots__/resume.expected.md
@@ -10,7 +10,7 @@
       0
     </button>
     <script>
-      $MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"e":[["count",["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/template.marko_0/onCount",null]]],"f":1,"p":null}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"]})
+      $MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"e":[["count",["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/template.marko_0/onCount",0]]],"f":1,"p":null}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"]})
     </script>
     <!--M]0 #text/0-->
     <div
@@ -20,7 +20,7 @@
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#scope":0,"#text/0!":_.a={"#scope":1,m5c:"s0"},"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"])},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={m5c:"s0"},"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"])},1:_.a}),[])
     </script>
   </body>
 </html>
@@ -49,17 +49,17 @@ container.querySelector("#class-api").click()
       1
     </button>
     <script>
-      $MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"e":[["count",["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/template.marko_0/onCount",null]]],"f":1,"p":null}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"]})
+      $MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"e":[["count",["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/template.marko_0/onCount",0]]],"f":1,"p":null}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"]})
     </script>
     <!--M]0 #text/0-->
     <div
       id="tags-api"
     >
-      0
+      1
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#scope":0,"#text/0!":_.a={"#scope":1,m5c:"s0"},"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"])},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={m5c:"s0"},"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"])},1:_.a}),[])
     </script>
   </body>
 </html>
@@ -67,6 +67,7 @@ container.querySelector("#class-api").click()
 
 # Mutations
 ```
+#document/html0/body1/div6/#text0: "0" => "1"
 #document/html0/body1/button2/#text0: "0" => "1"
 ```
 
@@ -85,17 +86,17 @@ container.querySelector("#class-api").click()
       2
     </button>
     <script>
-      $MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"e":[["count",["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/template.marko_0/onCount",null]]],"f":1,"p":null}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"]})
+      $MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"e":[["count",["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/template.marko_0/onCount",0]]],"f":1,"p":null}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"]})
     </script>
     <!--M]0 #text/0-->
     <div
       id="tags-api"
     >
-      0
+      2
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#scope":0,"#text/0!":_.a={"#scope":1,m5c:"s0"},"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"])},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={m5c:"s0"},"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"])},1:_.a}),[])
     </script>
   </body>
 </html>
@@ -103,5 +104,6 @@ container.querySelector("#class-api").click()
 
 # Mutations
 ```
+#document/html0/body1/div6/#text0: "1" => "2"
 #document/html0/body1/button2/#text0: "1" => "2"
 ```
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/__snapshots__/ssr.expected.md
index 887c47094..f4b50f7bb 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/__snapshots__/ssr.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[1><!--M#s0--><button id=class-api>0</button><!--M/--><script>$MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"e":[["count",["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/template.marko_0/onCount",null]]],"f":1,"p":null}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"]})</script><!M]0 #text/0><div id=tags-api>0<!M*0 #text/1></div><script>(M$h=[]).push(_=>(_.b={0:{"#scope":0,"#text/0!":_.a={"#scope":1,m5c:"s0"},"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"])},1:_.a}),[])</script>
+  <!M[1><!--M#s0--><button id=class-api>0</button><!--M/--><script>$MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"e":[["count",["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/template.marko_0/onCount",0]]],"f":1,"p":null}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"]})</script><!M]0 #text/0><div id=tags-api>0<!M*0 #text/1></div><script>(M$h=[]).push(_=>(_.b={0:{"#text/0!":_.a={m5c:"s0"},"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"])},1:_.a}),[])</script>
 
 
 # Render "End"
@@ -16,7 +16,7 @@
     </button>
     <!--M/-->
     <script>
-      $MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"e":[["count",["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/template.marko_0/onCount",null]]],"f":1,"p":null}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"]})
+      $MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"e":[["count",["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/template.marko_0/onCount",0]]],"f":1,"p":null}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"]})
     </script>
     <!--M]0 #text/0-->
     <div
@@ -26,7 +26,7 @@
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#scope":0,"#text/0!":_.a={"#scope":1,m5c:"s0"},"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"])},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={m5c:"s0"},"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/components/class-counter.marko"])},1:_.a}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/__snapshots__/resume.expected.md
index df96569da..4cc862d29 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/__snapshots__/resume.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/__snapshots__/resume.expected.md
@@ -19,7 +19,7 @@
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/template.marko"]})
@@ -76,7 +76,7 @@ container.querySelector("#tags").click()
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/template.marko"]})
@@ -114,7 +114,7 @@ container.querySelector("#class").click()
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/template.marko"]})
@@ -162,7 +162,7 @@ container.querySelector("#tags").click()
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/template.marko"]})
@@ -200,7 +200,7 @@ container.querySelector("#class").click()
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/template.marko"]})
@@ -248,7 +248,7 @@ container.querySelector("#tags").click()
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/template.marko"]})
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/__snapshots__/ssr.expected.md
index 8fa22b917..0b70dd260 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/__snapshots__/ssr.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!--M#s0--><!--F#0--><button id=tags>0<!M*0 #text/1></button><!M*0 #button/0><div><!M[1><button id=class>0</button><!M]0 #text/2></div><script>(M$h=[]).push(_=>(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])</script><!--F/--><!--M/--><script>$MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/template.marko"]})</script>
+  <!--M#s0--><!--F#0--><button id=tags>0<!M*0 #text/1></button><!M*0 #button/0><div><!M[1><button id=class>0</button><!M]0 #text/2></div><script>(M$h=[]).push(_=>(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])</script><!--F/--><!--M/--><script>$MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/template.marko"]})</script>
 
 
 # Render "End"
@@ -26,7 +26,7 @@
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <!--F/-->
     <!--M/-->
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/dom.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/dom.expected/template.js
index 52fd6d5e5..c34fd4c49 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/dom.expected/template.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/dom.expected/template.js
@@ -1,4 +1,4 @@
-import { on as _on, queueSource as _queueSource, data as _data, register as _register, createRenderer as _createRenderer, queueEffect as _queueEffect, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, dynamicTagAttrs as _dynamicTagAttrs, conditional as _conditional, dynamicSubscribers as _dynamicSubscribers, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { on as _on, queueSource as _queueSource, data as _data, register as _register, createRenderer as _createRenderer, queueEffect as _queueEffect, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, registerRenderer as _registerRenderer, dynamicTagAttrs as _dynamicTagAttrs, conditional as _conditional, dynamicSubscribers as _dynamicSubscribers, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 import _classLayout from "./components/class-layout.marko";
 import "marko/src/runtime/helpers/tags-compat/dom-debug.mjs";
 _register("packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko", _classLayout);
@@ -17,7 +17,7 @@ const _count$classLayoutBody = _registerSubscriber("packages/translator-interop/
   _data(_scope["#text/1"], count);
   _queueEffect(_scope, _count$classLayoutBody_effect);
 }));
-const _classLayoutBody = _register("packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<button id=tags> </button>", /* get, next(1), get */" D ", void 0, [_count$classLayoutBody]));
+const _classLayoutBody = _registerRenderer("packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<button id=tags> </button>", /* get, next(1), get */" D ", void 0, [_count$classLayoutBody]));
 const _classLayout_input = _dynamicTagAttrs("#text/0", _classLayoutBody);
 const _dynamicTagName = /* @__PURE__ */_conditional("#text/0", _scope => _classLayout_input(_scope, () => ({})), _classLayout_input);
 const _count = /* @__PURE__ */_value("count", null, _dynamicSubscribers("count"));
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/html.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/html.expected/template.js
index 7e2455eda..ec7840d1b 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/html.expected/template.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/html.expected/template.js
@@ -12,7 +12,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     _writeScope(_scope1_id, {
       "_": _ensureScopeWithId(_scope0_id)
     });
-  }), "packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"));
+  }), "packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer", _scope0_id));
   _s(_classLayout, "packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko");
   _write(`${_markResumeControlEnd(_scope0_id, "#text/0")}`);
   _writeScope(_scope0_id, {
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/resume.expected.md
index ded7f225a..a030094e9 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/resume.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/resume.expected.md
@@ -5,7 +5,7 @@
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,_:_.b={"#scope":0,count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={_:_.b={count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <button
       id="class"
@@ -25,7 +25,7 @@
       </script>
     </div>
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
@@ -61,7 +61,7 @@ container.querySelector("#tags").click()
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,_:_.b={"#scope":0,count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={_:_.b={count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <button
       id="class"
@@ -81,7 +81,7 @@ container.querySelector("#tags").click()
       </script>
     </div>
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
@@ -106,7 +106,7 @@ container.querySelector("#class").click()
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,_:_.b={"#scope":0,count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={_:_.b={count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <button
       id="class"
@@ -126,7 +126,7 @@ container.querySelector("#class").click()
       </script>
     </div>
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
@@ -151,7 +151,7 @@ container.querySelector("#tags").click()
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,_:_.b={"#scope":0,count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={_:_.b={count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <button
       id="class"
@@ -171,7 +171,7 @@ container.querySelector("#tags").click()
       </script>
     </div>
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
@@ -196,7 +196,7 @@ container.querySelector("#class").click()
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,_:_.b={"#scope":0,count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={_:_.b={count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <button
       id="class"
@@ -216,7 +216,7 @@ container.querySelector("#class").click()
       </script>
     </div>
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
@@ -241,7 +241,7 @@ container.querySelector("#tags").click()
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,_:_.b={"#scope":0,count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={_:_.b={count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <button
       id="class"
@@ -261,7 +261,7 @@ container.querySelector("#tags").click()
       </script>
     </div>
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/ssr.expected.md
index a0e7a1ad6..65ced8509 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/ssr.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/ssr.expected.md
@@ -1,9 +1,9 @@
 # Write
-  <!M[1><script>(M$h=[]).push(_=>(_.c={1:_.a={"#scope":1,_:_.b={"#scope":0,count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])</script>
+  <!M[1><script>(M$h=[]).push(_=>(_.c={1:_.a={_:_.b={count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])</script>
 
 
 # Write
-  <!--M#s0--><button id=class>0</button><div><!--F#2--><button id=tags>0<!M*1 #text/1></button><!M*1 #button/0><script>M$h.push(_=>(_.d={1:_.a}),[1,"packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_count/subscriber",1,"packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_count",])</script><!--F/--></div><!--M/--><script>$MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})</script><!M]0 #text/0><script>M$h.push(_=>(_.e={0:_.b}),[])</script>
+  <!--M#s0--><button id=class>0</button><div><!--F#2--><button id=tags>0<!M*1 #text/1></button><!M*1 #button/0><script>M$h.push(_=>(_.d={1:_.a}),[1,"packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_count/subscriber",1,"packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_count",])</script><!--F/--></div><!--M/--><script>$MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})</script><!M]0 #text/0><script>M$h.push(_=>(_.e={0:_.b}),[])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,_:_.b={"#scope":0,count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={_:_.b={count:0,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <!--M#s0-->
     <button
@@ -37,7 +37,7 @@
     </div>
     <!--M/-->
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/__snapshots__/resume.expected.md
index 9f9ef2b42..13c3522f2 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/__snapshots__/resume.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/__snapshots__/resume.expected.md
@@ -22,7 +22,7 @@
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/template.marko"]})
@@ -89,7 +89,7 @@ container.querySelector("#tags").click()
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/template.marko"]})
@@ -132,7 +132,7 @@ container.querySelector("#class").click()
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/template.marko"]})
@@ -190,7 +190,7 @@ container.querySelector("#tags").click()
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/template.marko"]})
@@ -233,7 +233,7 @@ container.querySelector("#class").click()
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/template.marko"]})
@@ -291,7 +291,7 @@ container.querySelector("#tags").click()
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <script>
       $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/template.marko"]})
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/__snapshots__/ssr.expected.md
index 509f98704..ab50bceb0 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/__snapshots__/ssr.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!--M#s0--><!--F#0--><button id=tags>0<!M*0 #text/1></button><!M*0 #button/0><div><!M[1><h1>hello</h1><button id=class>1 * 0 = 0</button><!M]0 #text/2></div><script>(M$h=[]).push(_=>(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])</script><!--F/--><!--M/--><script>$MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/template.marko"]})</script>
+  <!--M#s0--><!--F#0--><button id=tags>0<!M*0 #text/1></button><!M*0 #button/0><div><!M[1><h1>hello</h1><button id=class>1 * 0 = 0</button><!M]0 #text/2></div><script>(M$h=[]).push(_=>(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])</script><!--F/--><!--M/--><script>$MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-0":0}},"w":[["s0",0,{},{"f":1}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/template.marko"]})</script>
 
 
 # Render "End"
@@ -29,7 +29,7 @@
       <!--M]0 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#text/2!":_.a={}},1:_.a}),[0,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/components/tags-layout.marko_0_count",])
     </script>
     <!--F/-->
     <!--M/-->
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/dom.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/dom.expected/template.js
index da7641e54..402606bf9 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/dom.expected/template.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/dom.expected/template.js
@@ -1,4 +1,4 @@
-import { data as _data, on as _on, queueSource as _queueSource, register as _register, createRenderer as _createRenderer, intersection as _intersection, value as _value, queueEffect as _queueEffect, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, dynamicTagAttrs as _dynamicTagAttrs, conditional as _conditional, dynamicSubscribers as _dynamicSubscribers, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { data as _data, on as _on, queueSource as _queueSource, register as _register, createRenderer as _createRenderer, intersection as _intersection, value as _value, queueEffect as _queueEffect, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, registerRenderer as _registerRenderer, dynamicTagAttrs as _dynamicTagAttrs, conditional as _conditional, dynamicSubscribers as _dynamicSubscribers, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 import _classLayout from "./components/class-layout.marko";
 import "marko/src/runtime/helpers/tags-compat/dom-debug.mjs";
 _register("packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko", _classLayout);
@@ -32,7 +32,7 @@ const _multiplier$classLayoutBody = _registerSubscriber("packages/translator-int
   _data(_scope["#text/2"], multiplier);
   _queueEffect(_scope, _multiplier$classLayoutBody_effect);
 }, void 0, _expr_multiplier_baseCount$classLayoutBody));
-const _classLayoutBody = _register("packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<h1> </h1><button id=tags><!> * <!> = <!></button>", /* next(1), get, out(1), get, next(1), replace, over(2), replace, over(2), replace */"D l D%c%c%", void 0, [_multiplier$classLayoutBody], void 0, _params_2$classLayoutBody));
+const _classLayoutBody = _registerRenderer("packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<h1> </h1><button id=tags><!> * <!> = <!></button>", /* next(1), get, out(1), get, next(1), replace, over(2), replace, over(2), replace */"D l D%c%c%", void 0, [_multiplier$classLayoutBody], void 0, _params_2$classLayoutBody));
 const _classLayout_input = _dynamicTagAttrs("#text/0", _classLayoutBody);
 const _dynamicTagName = /* @__PURE__ */_conditional("#text/0", _scope => _classLayout_input(_scope, () => ({})), _classLayout_input);
 const _multiplier = /* @__PURE__ */_value("multiplier", null, _dynamicSubscribers("multiplier"));
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/html.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/html.expected/template.js
index 6fcedc609..0b1e97cf5 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/html.expected/template.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/html.expected/template.js
@@ -13,7 +13,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
       "baseCount": baseCount,
       "_": _ensureScopeWithId(_scope0_id)
     });
-  }), "packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"));
+  }), "packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer", _scope0_id));
   _s(_classLayout, "packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko");
   _write(`${_markResumeControlEnd(_scope0_id, "#text/0")}`);
   _writeScope(_scope0_id, {
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/resume.expected.md
index 4ab168e2c..4aa74dbc2 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/resume.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/resume.expected.md
@@ -5,7 +5,7 @@
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,baseCount:0,_:_.b={"#scope":0,multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={baseCount:0,_:_.b={multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <button
       id="class"
@@ -37,7 +37,7 @@
       </script>
     </div>
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
@@ -73,7 +73,7 @@ container.querySelector("#tags").click()
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,baseCount:0,_:_.b={"#scope":0,multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={baseCount:0,_:_.b={multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <button
       id="class"
@@ -105,7 +105,7 @@ container.querySelector("#tags").click()
       </script>
     </div>
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
@@ -130,7 +130,7 @@ container.querySelector("#class").click()
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,baseCount:0,_:_.b={"#scope":0,multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={baseCount:0,_:_.b={multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <button
       id="class"
@@ -162,7 +162,7 @@ container.querySelector("#class").click()
       </script>
     </div>
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
@@ -189,7 +189,7 @@ container.querySelector("#tags").click()
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,baseCount:0,_:_.b={"#scope":0,multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={baseCount:0,_:_.b={multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <button
       id="class"
@@ -221,7 +221,7 @@ container.querySelector("#tags").click()
       </script>
     </div>
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
@@ -247,7 +247,7 @@ container.querySelector("#class").click()
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,baseCount:0,_:_.b={"#scope":0,multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={baseCount:0,_:_.b={multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <button
       id="class"
@@ -279,7 +279,7 @@ container.querySelector("#class").click()
       </script>
     </div>
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
@@ -306,7 +306,7 @@ container.querySelector("#tags").click()
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,baseCount:0,_:_.b={"#scope":0,multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={baseCount:0,_:_.b={multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <button
       id="class"
@@ -338,7 +338,7 @@ container.querySelector("#tags").click()
       </script>
     </div>
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/ssr.expected.md
index b003e8170..55b0d7f78 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/ssr.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/ssr.expected.md
@@ -1,9 +1,9 @@
 # Write
-  <!M[1><script>(M$h=[]).push(_=>(_.c={1:_.a={"#scope":1,baseCount:0,_:_.b={"#scope":0,multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])</script>
+  <!M[1><script>(M$h=[]).push(_=>(_.c={1:_.a={baseCount:0,_:_.b={multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])</script>
 
 
 # Write
-  <!--M#s0--><button id=class>0</button><div><!--F#2--><h1>hello<!M*1 #text/0></h1><button id=tags>1<!M*1 #text/2> * <!>0<!M*1 #text/3> = <!>0<!M*1 #text/4></button><!M*1 #button/1><script>M$h.push(_=>(_.d={1:_.a}),[1,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_multiplier/subscriber",1,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_multiplier",])</script><!--F/--></div><!--M/--><script>$MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})</script><!M]0 #text/0><script>M$h.push(_=>(_.e={0:_.b}),[])</script>
+  <!--M#s0--><button id=class>0</button><div><!--F#2--><h1>hello<!M*1 #text/0></h1><button id=tags>1<!M*1 #text/2> * <!>0<!M*1 #text/3> = <!>0<!M*1 #text/4></button><!M*1 #button/1><script>M$h.push(_=>(_.d={1:_.a}),[1,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_multiplier/subscriber",1,"packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_multiplier",])</script><!--F/--></div><!--M/--><script>$MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})</script><!M]0 #text/0><script>M$h.push(_=>(_.e={0:_.b}),[])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
   <body>
     <!--M[1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={1:_.a={"#scope":1,baseCount:0,_:_.b={"#scope":0,multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0","#scope":2}},_.b["#text/0!"]=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={1:_.a={baseCount:0,_:_.b={multiplier:1,"#text/0(":_._["@marko/tags-compat-5-to-6"](_._["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"])}},2:{m5c:"s0"}},_.b["#text/0!"]=_.a,_.c),[])
     </script>
     <!--M#s0-->
     <button
@@ -49,7 +49,7 @@
     </div>
     <!--M/-->
     <script>
-      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer"]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
+      $MC=(window.$MC||[]).concat({"g":{"componentIdToScopeId":{"s0-2":1}},"w":[["s0",0,{"renderBody":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]},{"f":1,"r":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/template.marko_1_renderer",0]}]],"t":["packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/components/class-layout.marko"]})
     </script>
     <!--M]0 #text/0-->
     <script>
diff --git a/packages/translator-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js
index dcd0065d6..4a6218ea6 100644
--- a/packages/translator-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import { write as _write, createRenderer as _createRenderer, writeScope as _writeScope, nextScopeId as _nextScopeId, register as _register, markResumeControlSingleNodeEnd as _markResumeControlSingleNodeEnd, getScopeById as _getScopeById, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, peekNextScope as _peekNextScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { write as _write, createRenderer as _createRenderer, register as _register, writeScope as _writeScope, nextScopeId as _nextScopeId, markResumeControlSingleNodeEnd as _markResumeControlSingleNodeEnd, getScopeById as _getScopeById, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, peekNextScope as _peekNextScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _customTag from "./components/custom-tag/index.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
@@ -12,9 +12,9 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     const _scope2_id = _nextScopeId();
     _thing = {
       x: 1,
-      renderBody: /* @__PURE__ */_createRenderer(() => {
+      renderBody: _register( /* @__PURE__ */_createRenderer(() => {
         _write("Hello");
-      })
+      }), "packages/translator-tags/src/__tests__/fixtures/at-tag-inside-if-tag/template.marko_3_renderer")
     };
     _writeScope(_scope2_id, {});
     _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/at-tag-inside-if-tag/template.marko_2_renderer");
diff --git a/packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic-tag-parent/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic-tag-parent/__snapshots__/html.expected/template.js
index 4c3b03787..d3da4f4ed 100644
--- a/packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic-tag-parent/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic-tag-parent/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import { write as _write, createRenderer as _createRenderer, nextScopeId as _nextScopeId, register as _register, dynamicTagInput as _dynamicTagInput, markResumeControlEnd as _markResumeControlEnd, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { write as _write, createRenderer as _createRenderer, register as _register, nextScopeId as _nextScopeId, dynamicTagInput as _dynamicTagInput, markResumeControlEnd as _markResumeControlEnd, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
   const {
@@ -7,15 +7,15 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _dynamicScope = _dynamicTagInput(x, {
     header: {
       class: "my-header",
-      renderBody: /* @__PURE__ */_createRenderer(() => {
+      renderBody: _register( /* @__PURE__ */_createRenderer(() => {
         _write("Header content");
-      })
+      }), "packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic-tag-parent/template.marko_2_renderer")
     },
     footer: {
       class: "my-footer",
-      renderBody: /* @__PURE__ */_createRenderer(() => {
+      renderBody: _register( /* @__PURE__ */_createRenderer(() => {
         _write("Footer content");
-      })
+      }), "packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic-tag-parent/template.marko_3_renderer")
     }
   }, _register( /* @__PURE__ */_createRenderer(() => {
     const _scope1_id = _nextScopeId();
diff --git a/packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/template.js
index a8706a7e1..3d57ba05a 100644
--- a/packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import { escapeXML as _escapeXML, write as _write, createRenderer as _createRenderer, writeScope as _writeScope, nextScopeId as _nextScopeId, register as _register, markResumeControlSingleNodeEnd as _markResumeControlSingleNodeEnd, getScopeById as _getScopeById, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, peekNextScope as _peekNextScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { escapeXML as _escapeXML, write as _write, createRenderer as _createRenderer, register as _register, writeScope as _writeScope, nextScopeId as _nextScopeId, markResumeControlSingleNodeEnd as _markResumeControlSingleNodeEnd, getScopeById as _getScopeById, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, peekNextScope as _peekNextScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _hello from "./components/hello/index.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
@@ -11,9 +11,9 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   if (x) {
     const _scope2_id = _nextScopeId();
     _item = {
-      renderBody: /* @__PURE__ */_createRenderer(y => {
+      renderBody: _register( /* @__PURE__ */_createRenderer(y => {
         _write(`${_escapeXML(y)}`);
-      })
+      }), "packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/template.marko_3_renderer")
     };
     _writeScope(_scope2_id, {});
     _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/template.marko_2_renderer");
diff --git a/packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/template.js
index 2c452b68a..1861f0ae5 100644
--- a/packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import { write as _write, createRenderer as _createRenderer, ensureScopeWithId as _ensureScopeWithId, writeScope as _writeScope, nextScopeId as _nextScopeId, register as _register, markResumeControlSingleNodeEnd as _markResumeControlSingleNodeEnd, getScopeById as _getScopeById, maybeFlush as _maybeFlush, escapeXML as _escapeXML, markResumeNode as _markResumeNode, peekNextScope as _peekNextScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { write as _write, createRenderer as _createRenderer, register as _register, ensureScopeWithId as _ensureScopeWithId, writeScope as _writeScope, nextScopeId as _nextScopeId, markResumeControlSingleNodeEnd as _markResumeControlSingleNodeEnd, getScopeById as _getScopeById, maybeFlush as _maybeFlush, escapeXML as _escapeXML, markResumeNode as _markResumeNode, peekNextScope as _peekNextScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _hello from "./components/hello/index.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
@@ -14,14 +14,14 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
         style: {
           color
         },
-        renderBody: /* @__PURE__ */_createRenderer(() => {
+        renderBody: _register( /* @__PURE__ */_createRenderer(() => {
           _write("foo");
-        })
+        }), "packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic/template.marko_6_renderer")
       });
       _writeScope(_scope4_id, {
         "_": _ensureScopeWithId(_scope3_id)
       });
-      _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic/template.marko_4_renderer");
+      _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic/template.marko_4_renderer", _scope3_id);
       _ifScopeId = _scope4_id;
     } else {
       const _scope5_id = _nextScopeId();
@@ -29,14 +29,14 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
         style: {
           color
         },
-        renderBody: /* @__PURE__ */_createRenderer(() => {
+        renderBody: _register( /* @__PURE__ */_createRenderer(() => {
           _write("bar");
-        })
+        }), "packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic/template.marko_7_renderer")
       });
       _writeScope(_scope5_id, {
         "_": _ensureScopeWithId(_scope3_id)
       });
-      _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic/template.marko_5_renderer");
+      _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic/template.marko_5_renderer", _scope3_id);
       _ifScopeId = _scope5_id;
     }
     _write(`${_markResumeControlSingleNodeEnd(_scope3_id, "#text/0", _ifScopeId)}`);
@@ -58,9 +58,9 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
       let _i = _i2++;
       _row.push({
         row: row,
-        renderBody: /* @__PURE__ */_createRenderer(() => {
+        renderBody: _register( /* @__PURE__ */_createRenderer(() => {
           _write(`${_escapeXML(row)}${_markResumeNode(_scope11_id, "#text/0")}`);
-        })
+        }), "packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic/template.marko_11_renderer", _scope10_id)
       });
       _writeScope(_scope10_id, {
         "row": row
@@ -81,9 +81,9 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     outside: true,
     row: {
       row: -1,
-      renderBody: /* @__PURE__ */_createRenderer(() => {
+      renderBody: _register( /* @__PURE__ */_createRenderer(() => {
         _write("Outside");
-      })
+      }), "packages/translator-tags/src/__tests__/fixtures/at-tags-dynamic/template.marko_13_renderer")
     }
   });
   const _childScope = _peekNextScope();
diff --git a/packages/translator-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/template.js
index 6d3dfe5ed..23e1efbef 100644
--- a/packages/translator-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/template.js
@@ -1,13 +1,13 @@
-import { write as _write, createRenderer as _createRenderer, peekNextScope as _peekNextScope, writeScope as _writeScope, nextScopeId as _nextScopeId, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { write as _write, createRenderer as _createRenderer, register as _register, peekNextScope as _peekNextScope, writeScope as _writeScope, nextScopeId as _nextScopeId, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _hello from "./components/hello/index.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
   const _childScope = _peekNextScope();
   _hello._({
     foo: {
-      renderBody: /* @__PURE__ */_createRenderer(() => {
+      renderBody: _register( /* @__PURE__ */_createRenderer(() => {
         _write("Foo!");
-      })
+      }), "packages/translator-tags/src/__tests__/fixtures/at-tags/template.marko_2_renderer")
     }
   });
   _writeScope(_scope0_id, {
diff --git a/packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/resume.expected.md
index 5d4382178..c8a9ee354 100644
--- a/packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/resume.expected.md
@@ -13,7 +13,7 @@
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{disabled:!0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/template.marko_0_disabled",])
+      (M$h=[]).push(_=&gt;(_.a={0:{disabled:!0}}),[0,"packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/template.marko_0_disabled",])
     </script>
   </body>
 </html>
@@ -40,7 +40,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{disabled:!0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/template.marko_0_disabled",])
+      (M$h=[]).push(_=&gt;(_.a={0:{disabled:!0}}),[0,"packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/template.marko_0_disabled",])
     </script>
   </body>
 </html>
@@ -70,7 +70,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{disabled:!0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/template.marko_0_disabled",])
+      (M$h=[]).push(_=&gt;(_.a={0:{disabled:!0}}),[0,"packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/template.marko_0_disabled",])
     </script>
   </body>
 </html>
@@ -98,7 +98,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{disabled:!0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/template.marko_0_disabled",])
+      (M$h=[]).push(_=&gt;(_.a={0:{disabled:!0}}),[0,"packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/template.marko_0_disabled",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/ssr.expected.md
index 99cf30f19..91038b5eb 100644
--- a/packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <input disabled><!M*0 #input/0><button>enable<!M*0 #text/2></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.a={0:{disabled:!0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/template.marko_0_disabled",])</script>
+  <input disabled><!M*0 #input/0><button>enable<!M*0 #text/2></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.a={0:{disabled:!0}}),[0,"packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/template.marko_0_disabled",])</script>
 
 
 # Render "End"
@@ -17,7 +17,7 @@
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{disabled:!0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/template.marko_0_disabled",])
+      (M$h=[]).push(_=&gt;(_.a={0:{disabled:!0}}),[0,"packages/translator-tags/src/__tests__/fixtures/attr-boolean-dynamic/template.marko_0_disabled",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/template.js
index f90311b03..8be3d27b1 100644
--- a/packages/translator-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
-import { classAttr as _classAttr, write as _write, createRenderer as _createRenderer, register as _register, dynamicTagAttrs as _dynamicTagAttrs, intersection as _intersection, conditional as _conditional, intersections as _intersections, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { classAttr as _classAttr, write as _write, createRenderer as _createRenderer, register as _register, registerRenderer as _registerRenderer, dynamicTagAttrs as _dynamicTagAttrs, intersection as _intersection, conditional as _conditional, intersections as _intersections, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 import { _setup_ as _customTag, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./components/custom-tag.marko";
 const _testBody = _register("packages/translator-tags/src/__tests__/fixtures/attr-class/template.marko_2_renderer", /* @__PURE__ */_createRenderer("", ""));
-const _inputTestBody = _register("packages/translator-tags/src/__tests__/fixtures/attr-class/template.marko_1_renderer", /* @__PURE__ */_createRenderer("", ""));
+const _inputTestBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/attr-class/template.marko_1_renderer", /* @__PURE__ */_createRenderer("", ""));
 const _inputTest_input = _dynamicTagAttrs("#text/3", _inputTestBody);
 const _expr_Text_c_d = /* @__PURE__ */_intersection(3, _scope => {
   const {
diff --git a/packages/translator-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/template.js
index 37a6a059a..6977986ce 100644
--- a/packages/translator-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import { classAttr as _classAttr, markResumeNode as _markResumeNode, write as _write, peekNextScope as _peekNextScope, createRenderer as _createRenderer, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, register as _register, dynamicTagInput as _dynamicTagInput, markResumeControlEnd as _markResumeControlEnd, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { classAttr as _classAttr, markResumeNode as _markResumeNode, write as _write, peekNextScope as _peekNextScope, createRenderer as _createRenderer, register as _register, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, dynamicTagInput as _dynamicTagInput, markResumeControlEnd as _markResumeControlEnd, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _customTag from "./components/custom-tag.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
@@ -31,9 +31,9 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
         b: c,
         d
       }],
-      renderBody: /* @__PURE__ */_createRenderer(() => {
+      renderBody: _register( /* @__PURE__ */_createRenderer(() => {
         _write("Hello");
-      })
+      }), "packages/translator-tags/src/__tests__/fixtures/attr-class/template.marko_2_renderer")
     }
   }, _register( /* @__PURE__ */_createRenderer(() => {
     const _scope1_id = _nextScopeId();
@@ -42,7 +42,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     _writeScope(_scope1_id, {
       "_": _ensureScopeWithId(_scope0_id)
     });
-  }), "packages/translator-tags/src/__tests__/fixtures/attr-class/template.marko_1_renderer"));
+  }), "packages/translator-tags/src/__tests__/fixtures/attr-class/template.marko_1_renderer", _scope0_id));
   _write(`${_markResumeControlEnd(_scope0_id, "#text/3")}`);
   _writeScope(_scope0_id, {
     "c": c,
diff --git a/packages/translator-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/template.js
index 603c6d93e..96478687d 100644
--- a/packages/translator-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import { styleAttr as _styleAttr, markResumeNode as _markResumeNode, write as _write, peekNextScope as _peekNextScope, createRenderer as _createRenderer, dynamicTagInput as _dynamicTagInput, markResumeControlEnd as _markResumeControlEnd, writeScope as _writeScope, nextScopeId as _nextScopeId, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { styleAttr as _styleAttr, markResumeNode as _markResumeNode, write as _write, peekNextScope as _peekNextScope, createRenderer as _createRenderer, register as _register, dynamicTagInput as _dynamicTagInput, markResumeControlEnd as _markResumeControlEnd, writeScope as _writeScope, nextScopeId as _nextScopeId, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _customTag from "./components/custom-tag.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
@@ -33,9 +33,9 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
       style: {
         color: "green"
       },
-      renderBody: /* @__PURE__ */_createRenderer(() => {
+      renderBody: _register( /* @__PURE__ */_createRenderer(() => {
         _write("Hello");
-      })
+      }), "packages/translator-tags/src/__tests__/fixtures/attr-style/template.marko_2_renderer")
     }
   });
   _write(`${_markResumeControlEnd(_scope0_id, "#text/4")}`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/resume.expected.md
index 42920a41c..b35ffd5aa 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
@@ -34,7 +34,7 @@ container.querySelector("button").click()
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/ssr.expected.md
index 992f123ad..57d3806e5 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>0<!M*1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/components/my-button.marko_0_onClick",])</script>
+  <button>0<!M*1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/components/my-button.marko_0_onClick",])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-attrs/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/resume.expected.md
index e9fa01ea5..3e0ed1fde 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
@@ -34,7 +34,7 @@ container.querySelector("button").click()
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
@@ -59,7 +59,7 @@ container.querySelector("button").click()
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/ssr.expected.md
index d8d039346..cb075cab3 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>0<!M*1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/components/my-button.marko_0_onClick",])</script>
+  <button>0<!M*1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/components/my-button.marko_0_onClick",])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-alias/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/resume.expected.md
index e574d5912..53608a651 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/resume.expected.md
@@ -13,7 +13,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
@@ -42,7 +42,7 @@ container.querySelector("button").click()
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
@@ -72,7 +72,7 @@ container.querySelector("button").click()
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/ssr.expected.md
index 443f3eb39..4263c2401 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>0<!M*1 #text/1> <!>0<!M*1 #text/2></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/components/my-button.marko_0_onClick",])</script>
+  <button>0<!M*1 #text/1> <!>0<!M*1 #text/2></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/components/my-button.marko_0_onClick",])</script>
 
 
 # Render "End"
@@ -17,7 +17,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/resume.expected.md
index 6b08ce0f7..218e2bc45 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/resume.expected.md
@@ -13,7 +13,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
@@ -42,7 +42,7 @@ container.querySelector("button").click()
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
@@ -72,7 +72,7 @@ container.querySelector("button").click()
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/ssr.expected.md
index dbc149e7a..0d77c02e7 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>0<!M*1 #text/1> <!>0<!M*1 #text/2></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/components/my-button.marko_0_onClick",])</script>
+  <button>0<!M*1 #text/1> <!>0<!M*1 #text/2></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/components/my-button.marko_0_onClick",])</script>
 
 
 # Render "End"
@@ -17,7 +17,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/resume.expected.md
index 077441245..a716cbf59 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
@@ -34,7 +34,7 @@ container.querySelector("button").click()
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
@@ -59,7 +59,7 @@ container.querySelector("button").click()
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/ssr.expected.md
index 4cd8c0565..d1d972047 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>0<!M*1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input/components/my-button.marko_0_onClick",])</script>
+  <button>0<!M*1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input/components/my-button.marko_0_onClick",])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-input/template.marko_0/onClick"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component-input/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.js
index 7a0ec60d9..f9b30c16e 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.js
@@ -1,4 +1,4 @@
-import { queueSource as _queueSource, data as _data, register as _register, inChild as _inChild, bindRenderer as _bindRenderer, createRenderer as _createRenderer, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, dynamicSubscribers as _dynamicSubscribers, intersections as _intersections, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { queueSource as _queueSource, data as _data, register as _register, inChild as _inChild, bindRenderer as _bindRenderer, createRenderer as _createRenderer, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, registerRenderer as _registerRenderer, dynamicSubscribers as _dynamicSubscribers, intersections as _intersections, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 import { _setup_ as _myButton, _onClick_ as _myButton__onClick_, _renderBody_ as _myButton_renderBody, _template_ as _myButton_template, _walks_ as _myButton_walks } from "./components/my-button.marko";
 const _onClick = _register("packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick", _scope => {
   const {
@@ -9,7 +9,7 @@ const _onClick = _register("packages/translator-tags/src/__tests__/fixtures/basi
   };
 });
 const _clickCount$myButtonBody = _registerSubscriber("packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber", /* @__PURE__ */_dynamicClosure("clickCount", (_scope, clickCount) => _data(_scope["#text/0"], clickCount)));
-const _myButtonBody = _register("packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_renderer", /* @__PURE__ */_createRenderer(" ", /* get */" ", void 0, [_clickCount$myButtonBody]));
+const _myButtonBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_renderer", /* @__PURE__ */_createRenderer(" ", /* get */" ", void 0, [_clickCount$myButtonBody]));
 const _clickCount = /* @__PURE__ */_value("clickCount", (_scope, clickCount) => _myButton__onClick_(_scope["#childScope/0"], _onClick(_scope)), _intersections([_inChild("#childScope/0", _myButton__onClick_), _dynamicSubscribers("clickCount")]));
 const _setup = _scope => {
   _myButton(_scope["#childScope/0"]);
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js
index 8960b04cc..5ac55ee37 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js
@@ -8,14 +8,14 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     onClick: _register(function () {
       clickCount++;
     }, "packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick", _scope0_id),
-    renderBody: /* @__PURE__ */_createRenderer(() => {
+    renderBody: _register( /* @__PURE__ */_createRenderer(() => {
       const _scope1_id = _nextScopeId();
       _write(`${_escapeXML(clickCount)}${_markResumeNode(_scope1_id, "#text/0")}`);
       _writeEffect(_scope1_id, "packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber");
       _writeScope(_scope1_id, {
         "_": _ensureScopeWithId(_scope0_id)
       });
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_renderer", _scope0_id)
   });
   _writeScope(_scope0_id, {
     "clickCount": clickCount,
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md
index d27cb6190..d8a5bac1b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1,"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick"](_.a),_.c._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
@@ -38,7 +38,7 @@ container.querySelector("button").click()
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1,"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick"](_.a),_.c._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
@@ -65,7 +65,7 @@ container.querySelector("button").click()
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1,"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick"](_.a),_.c._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
@@ -92,7 +92,7 @@ container.querySelector("button").click()
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1,"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick"](_.a),_.c._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md
index c78215eb7..b9f2955a2 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button><!M[2>0<!M*2 #text/0><!M]1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.d={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1,"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick"](_.a),_.c._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko_0_onClick",])</script>
+  <button><!M[2>0<!M*2 #text/0><!M]1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko_0_onClick",])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.b={"#scope":1,"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick"](_.a),_.c._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko_0_onClick",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko_0_onClick",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component/__snapshots__/resume.expected.md
index f23bc707a..c4a4d57da 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
       <!--M*1 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={"#scope":1,clickCount:0},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component/components/counter.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={clickCount:0}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component/components/counter.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -38,7 +38,7 @@ container.querySelector("button").click()
       <!--M*1 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={"#scope":1,clickCount:0},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component/components/counter.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={clickCount:0}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component/components/counter.marko_0_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-component/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-component/__snapshots__/ssr.expected.md
index 0063e068d..9b6c890fd 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-component/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-component/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><button>0<!M*1 #text/1></button><!M*1 #button/0></div><script>(M$h=[]).push(_=>(_.b={0:{"#childScope/0":_.a={"#scope":1,clickCount:0},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component/components/counter.marko_0_clickCount",])</script>
+  <div><button>0<!M*1 #text/1></button><!M*1 #button/0></div><script>(M$h=[]).push(_=>(_.b={0:{"#childScope/0":_.a={clickCount:0}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component/components/counter.marko_0_clickCount",])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
       <!--M*1 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={"#scope":1,clickCount:0},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component/components/counter.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={clickCount:0}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/basic-component/components/counter.marko_0_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/dom.expected/template.js
index e8a61b57a..c9d69512d 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
-import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, closure as _closure, register as _register, conditional as _conditional, queueEffect as _queueEffect, inConditionalScope as _inConditionalScope, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, closure as _closure, registerRenderer as _registerRenderer, conditional as _conditional, register as _register, queueEffect as _queueEffect, inConditionalScope as _inConditionalScope, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 const _count$ifBody = /* @__PURE__ */_closure("count", (_scope, count) => _data(_scope["#text/0"], count));
-const _ifBody = _register("packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer", /* @__PURE__ */_createRenderer("The count is <!>", /* over(1), replace */"b%", void 0, [_count$ifBody]));
+const _ifBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer", /* @__PURE__ */_createRenderer("The count is <!>", /* over(1), replace */"b%", void 0, [_count$ifBody]));
 const _if = /* @__PURE__ */_conditional("#text/2");
 const _onClick = _scope => {
   const {
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/html.expected/template.js
index 4965d32f4..f5f78925c 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/html.expected/template.js
@@ -11,7 +11,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     _writeScope(_scope1_id, {
       "_": _ensureScopeWithId(_scope0_id)
     });
-    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer");
+    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer", _scope0_id);
     _ifScopeId = _scope1_id;
   }
   _write(`${_markResumeControlEnd(_scope0_id, "#text/2")}`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/resume.expected.md
index 6cd878560..db53d3368 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/resume.expected.md
@@ -18,7 +18,7 @@
     <!--M*1 #text/0-->
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -52,7 +52,7 @@ container.querySelector("button.inc").click()
     <!--M*1 #text/0-->
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -81,7 +81,7 @@ container.querySelector("button.toggle").click()
     <!--M*0 #button/1-->
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -116,7 +116,7 @@ container.querySelector("button.inc").click()
     <!--M*0 #button/1-->
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -145,7 +145,7 @@ container.querySelector("button.toggle").click()
     <!--M*0 #button/1-->
     The count is 2
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -177,7 +177,7 @@ container.querySelector("button.inc").click()
     <!--M*0 #button/1-->
     The count is 3
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/ssr.expected.md
index 3199d0e9b..098610c97 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button class=inc></button><!M*0 #button/0><button class=toggle></button><!M*0 #button/1><!M[1>The count is <!>0<!M*1 #text/0><!M]0 #text/2><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])</script>
+  <button class=inc></button><!M*0 #button/0><button class=toggle></button><!M*0 #button/1><!M[1>The count is <!>0<!M*1 #text/0><!M]0 #text/2><script>(M$h=[]).push(_=>(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])</script>
 
 
 # Render "End"
@@ -22,7 +22,7 @@
     <!--M*1 #text/0-->
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/dom.expected/template.js
index f95506668..07f5a699f 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
-import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, closure as _closure, register as _register, conditional as _conditional, queueEffect as _queueEffect, inConditionalScope as _inConditionalScope, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, closure as _closure, registerRenderer as _registerRenderer, conditional as _conditional, register as _register, queueEffect as _queueEffect, inConditionalScope as _inConditionalScope, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 const _count$ifBody = /* @__PURE__ */_closure("count", (_scope, count) => _data(_scope["#text/0"], count));
-const _ifBody = _register("packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<span> </span>", /* next(1), get */"D ", void 0, [_count$ifBody]));
+const _ifBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<span> </span>", /* next(1), get */"D ", void 0, [_count$ifBody]));
 const _if = /* @__PURE__ */_conditional("#text/2");
 const _onClick = _scope => {
   const {
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/html.expected/template.js
index de1ef3eba..fe5b1506b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/html.expected/template.js
@@ -11,7 +11,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     _writeScope(_scope1_id, {
       "_": _ensureScopeWithId(_scope0_id)
     });
-    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer");
+    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer", _scope0_id);
     _ifScopeId = _scope1_id;
   }
   _write(`${_markResumeControlSingleNodeEnd(_scope0_id, "#text/2", _ifScopeId)}`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/resume.expected.md
index d991fc7d9..7a6a3bde3 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/resume.expected.md
@@ -17,7 +17,7 @@
     </span>
     <!--M|0 #text/2 1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -50,7 +50,7 @@ container.querySelector("button.inc").click()
     </span>
     <!--M|0 #text/2 1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -79,7 +79,7 @@ container.querySelector("button.toggle").click()
     <!--M*0 #button/1-->
     <!--M|0 #text/2 1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -110,7 +110,7 @@ container.querySelector("button.inc").click()
     <!--M*0 #button/1-->
     <!--M|0 #text/2 1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -141,7 +141,7 @@ container.querySelector("button.toggle").click()
       2
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -174,7 +174,7 @@ container.querySelector("button.inc").click()
       3
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/ssr.expected.md
index d21a93975..8c49546a7 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button class=inc></button><!M*0 #button/0><button class=toggle></button><!M*0 #button/1><span>0<!M*1 #text/0></span><!M|0 #text/2 1><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])</script>
+  <button class=inc></button><!M*0 #button/0><button class=toggle></button><!M*0 #button/1><span>0<!M*1 #text/0></span><!M|0 #text/2 1><script>(M$h=[]).push(_=>(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])</script>
 
 
 # Render "End"
@@ -21,7 +21,7 @@
     </span>
     <!--M|0 #text/2 1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,count:0,"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"],"#text/2!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2!":_.b={}},1:_.b},_.a["#text/2("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_show",0,"packages/translator-tags/src/__tests__/fixtures/basic-conditional-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/resume.expected.md
index 98462ce58..c1384f609 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/resume.expected.md
@@ -6,7 +6,7 @@
     0
     <!--M*1 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,a:0,b:0,"#text/0!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={a:0,b:0,"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/ssr.expected.md
index 7b2f0c22e..04b06c3c0 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  0<!M*1 #text/0><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,a:0,b:0,"#text/0!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[])</script>
+  0<!M*1 #text/0><script>(M$h=[]).push(_=>(_.c={0:_.a={a:0,b:0,"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),[])</script>
 
 
 # Render "End"
@@ -10,7 +10,7 @@
     0
     <!--M*1 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,a:0,b:0,"#text/0!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={a:0,b:0,"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/resume.expected.md
index 9b1a836fc..bfe545fde 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/resume.expected.md
@@ -24,7 +24,7 @@
       <!--M*0 #text/3-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,multiplier:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_multiplier",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0,multiplier:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_multiplier",])
     </script>
   </body>
 </html>
@@ -64,7 +64,7 @@ container.querySelector("button#count").click()
       <!--M*0 #text/3-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,multiplier:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_multiplier",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0,multiplier:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_multiplier",])
     </script>
   </body>
 </html>
@@ -104,7 +104,7 @@ container.querySelector("button#count").click()
       <!--M*0 #text/3-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,multiplier:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_multiplier",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0,multiplier:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_multiplier",])
     </script>
   </body>
 </html>
@@ -144,7 +144,7 @@ container.querySelector("button#multiplier").click()
       <!--M*0 #text/3-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,multiplier:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_multiplier",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0,multiplier:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_multiplier",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/ssr.expected.md
index 652fbacc4..36e90a55d 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button id=multiplier>increase multiplier (<!>1<!M*0 #text/1>)</button><!M*0 #button/0><button id=count>increase count</button><!M*0 #button/2><div>0<!M*0 #text/3></div><script>(M$h=[]).push(_=>(_.a={0:{count:0,multiplier:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_multiplier",])</script>
+  <button id=multiplier>increase multiplier (<!>1<!M*0 #text/1>)</button><!M*0 #button/0><button id=count>increase count</button><!M*0 #button/2><div>0<!M*0 #text/3></div><script>(M$h=[]).push(_=>(_.a={0:{count:0,multiplier:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_multiplier",])</script>
 
 
 # Render "End"
@@ -28,7 +28,7 @@
       <!--M*0 #text/3-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,multiplier:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_multiplier",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0,multiplier:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/basic-counter-multiplier/template.marko_0_multiplier",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-counter/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-counter/__snapshots__/resume.expected.md
index 8eb02e8de..00f42253c 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-counter/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-counter/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -38,7 +38,7 @@ container.querySelector("button").click()
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -65,7 +65,7 @@ container.querySelector("button").click()
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -92,7 +92,7 @@ container.querySelector("button").click()
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-counter/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-counter/__snapshots__/ssr.expected.md
index cdfe3475c..7d3e031ab 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-counter/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-counter/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><button>0<!M*0 #text/1></button><!M*0 #button/0></div><script>(M$h=[]).push(_=>(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko_0_clickCount",])</script>
+  <div><button>0<!M*0 #text/1></button><!M*0 #button/0></div><script>(M$h=[]).push(_=>(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko_0_clickCount",])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/resume.expected.md
index db649b81f..9a3cd64aa 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     </h1>
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={"#scope":1},"#text/0(":"h1","#scope":0},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={},"#text/0(":"h1"},1:_.a}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/ssr.expected.md
index c846bc52c..0518cdf1d 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[1><h1 class="a b">Hello World</h1><!M]0 #text/0><script>(M$h=[]).push(_=>(_.b={0:{"#text/0!":_.a={"#scope":1},"#text/0(":"h1","#scope":0},1:_.a}),[])</script>
+  <!M[1><h1 class="a b">Hello World</h1><!M]0 #text/0><script>(M$h=[]).push(_=>(_.b={0:{"#text/0!":_.a={},"#text/0(":"h1"},1:_.a}),[])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
     </h1>
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={"#scope":1},"#text/0(":"h1","#scope":0},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={},"#text/0(":"h1"},1:_.a}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/dom.expected/template.js
index b1b9668cf..300405bec 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
-import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, closure as _closure, register as _register, conditional as _conditional, value as _value, inConditionalScope as _inConditionalScope, queueEffect as _queueEffect, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, closure as _closure, registerRenderer as _registerRenderer, conditional as _conditional, value as _value, inConditionalScope as _inConditionalScope, register as _register, queueEffect as _queueEffect, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 const _message$ifBody = /* @__PURE__ */_closure("message", (_scope, message) => _data(_scope["#text/0"], message.text));
-const _ifBody = _register("packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_1_renderer", /* @__PURE__ */_createRenderer(" ", /* get */" ", void 0, [_message$ifBody]));
+const _ifBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_1_renderer", /* @__PURE__ */_createRenderer(" ", /* get */" ", void 0, [_message$ifBody]));
 const _if = /* @__PURE__ */_conditional("#text/1");
 const _show = /* @__PURE__ */_value("show", (_scope, show) => _if(_scope, show ? _ifBody : null), _if);
 const _message = /* @__PURE__ */_value("message", null, _inConditionalScope(_message$ifBody, "#text/1"));
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/html.expected/template.js
index 4fd7b44ea..bdabb1dd5 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/html.expected/template.js
@@ -13,7 +13,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     _writeScope(_scope1_id, {
       "_": _ensureScopeWithId(_scope0_id)
     });
-    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_1_renderer");
+    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_1_renderer", _scope0_id);
     _ifScopeId = _scope1_id;
   }
   _write(`${_markResumeControlSingleNodeEnd(_scope0_id, "#text/1", _ifScopeId)}`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/resume.expected.md
index 0df3dce5c..07efa28e8 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     <!--M*1 #text/0-->
     <!--M|0 #text/1 1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,message:{text:"hi"},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_0",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={message:{text:"hi"},"#text/1!":_.b={}},1:_.b},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_0",])
     </script>
   </body>
 </html>
@@ -37,7 +37,7 @@ container.querySelector("button").click()
     <!--M|0 #text/1 1-->
     <!--M*1 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,message:{text:"hi"},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_0",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={message:{text:"hi"},"#text/1!":_.b={}},1:_.b},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_0",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/ssr.expected.md
index 51e8b33f3..ca13dc57e 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>hide</button><!M*0 #button/0>hi<!M*1 #text/0><!M|0 #text/1 1><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,message:{text:"hi"},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_0",])</script>
+  <button>hide</button><!M*0 #button/0>hi<!M*1 #text/0><!M|0 #text/1 1><script>(M$h=[]).push(_=>(_.c={0:_.a={message:{text:"hi"},"#text/1!":_.b={}},1:_.b},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_0",])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
     <!--M*1 #text/0-->
     <!--M|0 #text/1 1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,message:{text:"hi"},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_0",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={message:{text:"hi"},"#text/1!":_.b={}},1:_.b},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/basic-execution-order/template.marko_0",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/resume.expected.md
index 80eeff01c..6553dc066 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -34,7 +34,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -59,7 +59,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -84,7 +84,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/ssr.expected.md
index e696e34d6..a6ecb51a5 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>0<!M*0 #text/1></button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/template.marko_0_count",])</script>
+  <button>0<!M*0 #text/1></button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/template.marko_0_count",])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-fn-with-block/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/resume.expected.md
index e9d7aa369..ef1fe366a 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{a:[0],b:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/template.marko_0_a_b",])
+      (M$h=[]).push(_=&gt;(_.a={0:{a:[0],b:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/template.marko_0_a_b",])
     </script>
   </body>
 </html>
@@ -34,7 +34,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{a:[0],b:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/template.marko_0_a_b",])
+      (M$h=[]).push(_=&gt;(_.a={0:{a:[0],b:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/template.marko_0_a_b",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/ssr.expected.md
index cd545c827..db46c23bf 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>0<!M*0 #text/1></button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{a:[0],b:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/template.marko_0_a_b",])</script>
+  <button>0<!M*0 #text/1></button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{a:[0],b:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/template.marko_0_a_b",])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{a:[0],b:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/template.marko_0_a_b",])
+      (M$h=[]).push(_=&gt;(_.a={0:{a:[0],b:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/template.marko_0_a_b",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/components/comments.js b/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/components/comments.js
index cb1526b4d..e5aae3e3f 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/components/comments.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/components/comments.js
@@ -1,4 +1,4 @@
-import { attr as _attr, data as _data, on as _on, queueSource as _queueSource, inChild as _inChild, createRenderer as _createRenderer, intersection as _intersection, closure as _closure, register as _register, conditional as _conditional, queueEffect as _queueEffect, value as _value, inConditionalScope as _inConditionalScope, intersections as _intersections, loopOf as _loopOf, inLoopScope as _inLoopScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { attr as _attr, data as _data, on as _on, queueSource as _queueSource, inChild as _inChild, createRenderer as _createRenderer, intersection as _intersection, closure as _closure, registerRenderer as _registerRenderer, conditional as _conditional, register as _register, queueEffect as _queueEffect, value as _value, inConditionalScope as _inConditionalScope, intersections as _intersections, loopOf as _loopOf, inLoopScope as _inLoopScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 import { _setup_ as _comments, _input_ as _comments_input, _template_ as _comments_template, _walks_ as _comments_walks } from "./comments.marko";
 const _expr_comment_id$ifBody = /* @__PURE__ */_intersection(2, _scope => {
   const {
@@ -17,7 +17,7 @@ const _comment$ifBody = /* @__PURE__ */_closure("comment", null, void 0, _expr_c
 const _setup$ifBody = _scope => {
   _comments(_scope["#childScope/0"]);
 };
-const _ifBody = _register("packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_2_renderer", /* @__PURE__ */_createRenderer(`${_comments_template}`, /* beginChild, _comments_walks, endChild */`/${_comments_walks}&`, _setup$ifBody, [_comment$ifBody, _id$ifBody]));
+const _ifBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_2_renderer", /* @__PURE__ */_createRenderer(`${_comments_template}`, /* beginChild, _comments_walks, endChild */`/${_comments_walks}&`, _setup$ifBody, [_comment$ifBody, _id$ifBody]));
 const _expr_input_i$forBody = /* @__PURE__ */_intersection(2, _scope => {
   const {
     _: {
@@ -56,7 +56,7 @@ const _input$forBody = /* @__PURE__ */_closure("input", null, void 0, _expr_inpu
 const _setup$forBody = _scope => {
   _open$forBody(_scope, true);
 };
-const _forBody = _register("packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_renderer", /* @__PURE__ */_createRenderer("<li><span> </span><button> </button><!></li>", /* get, next(2), get, out(1), get, next(1), get, out(1), replace */" E l D l%", _setup$forBody, [_input$forBody], void 0, _params_2$forBody));
+const _forBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_renderer", /* @__PURE__ */_createRenderer("<li><span> </span><button> </button><!></li>", /* get, next(2), get, out(1), get, next(1), get, out(1), replace */" E l D l%", _setup$forBody, [_input$forBody], void 0, _params_2$forBody));
 const _for = /* @__PURE__ */_loopOf("#ul/0", _forBody);
 export const _input_ = /* @__PURE__ */_value("input", (_scope, input) => _for(_scope, [input.comments]), _inLoopScope(_input$forBody, "#ul/0"));
 export const _params__ = /* @__PURE__ */_value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), _input_);
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/components/comments.js b/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/components/comments.js
index cd3b83387..9d1692476 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/components/comments.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/components/comments.js
@@ -23,7 +23,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
         "#childScope/0": _childScope,
         "_": _ensureScopeWithId(_scope1_id)
       });
-      _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_2_renderer");
+      _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_2_renderer", _scope1_id);
       _ifScopeId = _scope2_id;
     }
     _write(`${_markResumeControlSingleNodeEnd(_scope1_id, "#text/4", _ifScopeId)}</li>${_markResumeNode(_scope1_id, "#li/0")}`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/ssr.expected.md
index 3dbb74140..be83668ed 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <ul><!M[2><li id=c-0><span>Hello World<!M*2 #text/1></span><button>[-]<!M*2 #text/3></button><!M*2 #button/2><ul><!M[5><li id=c-0-0><span>testing 123<!M*5 #text/1></span><button>[-]<!M*5 #text/3></button><!M*5 #button/2><!M|5 #text/4 ></li><!M*5 #li/0><!M]4 #ul/0></ul><!M*4 #ul/0><!M|2 #text/4 3></li><!M*2 #li/0><!M[6><li id=c-1><span>Goodbye World<!M*6 #text/1></span><button>[-]<!M*6 #text/3></button><!M*6 #button/2><!M|6 #text/4 ></li><!M*6 #li/0><!M]1 #ul/0></ul><!M*1 #ul/0><script>(M$h=[]).push(_=>(_.m={0:{"#childScope/0":_.j={"#scope":1,input:{comments:[_.b={text:"Hello World",comments:_.c=[_.e={text:"testing 123"}]},_.k={text:"Goodbye World"}]},"#ul/0(":new Map(_.a=[[0,_.h={"#scope":2,comment:_.b,id:"c-0",open:!0,"#text/4(":_._["packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_2_renderer"],"#text/4!":_.i={"#childScope/0":_.f={"#scope":4,input:{comments:_.c,path:"c-0"},"#ul/0(":new Map(_.d=[[0,_.g={comment:_.e,id:"c-0-0",open:!0,"#scope":5}]])},"#scope":3}}],[1,_.l={comment:_.k,id:"c-1",open:!0,"#scope":6}]])},"#scope":0},1:_.j,2:_.h,3:_.i,4:_.f,5:_.g,6:_.l},_.g._=_.f,_.i._=_.h,_.h._=_.l._=_.j,_.m),[5,"packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_open",2,"packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_open",6,"packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_open",])</script>
+  <ul><!M[2><li id=c-0><span>Hello World<!M*2 #text/1></span><button>[-]<!M*2 #text/3></button><!M*2 #button/2><ul><!M[5><li id=c-0-0><span>testing 123<!M*5 #text/1></span><button>[-]<!M*5 #text/3></button><!M*5 #button/2><!M|5 #text/4 ></li><!M*5 #li/0><!M]4 #ul/0></ul><!M*4 #ul/0><!M|2 #text/4 3></li><!M*2 #li/0><!M[6><li id=c-1><span>Goodbye World<!M*6 #text/1></span><button>[-]<!M*6 #text/3></button><!M*6 #button/2><!M|6 #text/4 ></li><!M*6 #li/0><!M]1 #ul/0></ul><!M*1 #ul/0><script>(M$h=[]).push(_=>(_.m={0:{"#childScope/0":_.j={input:{comments:[_.b={text:"Hello World",comments:_.d=[_.f={text:"testing 123"}]},_.k={text:"Goodbye World"}]},"#ul/0(":new Map(_.a=[[0,_.c={comment:_.b,id:"c-0",open:!0,"#text/4!":_.i={"#childScope/0":_.g={input:{comments:_.d,path:"c-0"},"#ul/0(":new Map(_.e=[[0,_.h={comment:_.f,id:"c-0-0",open:!0}]])}}}],[1,_.l={comment:_.k,id:"c-1",open:!0}]])}},1:_.j,2:_.c,3:_.i,4:_.g,5:_.h,6:_.l},_.c["#text/4("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_2_renderer"](_.c),_.h._=_.g,_.i._=_.c,_.c._=_.l._=_.j,_.m),[5,"packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_open",2,"packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_open",6,"packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_open",])</script>
 
 
 # Render "End"
@@ -64,7 +64,7 @@
     </ul>
     <!--M*1 #ul/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.m={0:{"#childScope/0":_.j={"#scope":1,input:{comments:[_.b={text:"Hello World",comments:_.c=[_.e={text:"testing 123"}]},_.k={text:"Goodbye World"}]},"#ul/0(":new Map(_.a=[[0,_.h={"#scope":2,comment:_.b,id:"c-0",open:!0,"#text/4(":_._["packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_2_renderer"],"#text/4!":_.i={"#childScope/0":_.f={"#scope":4,input:{comments:_.c,path:"c-0"},"#ul/0(":new Map(_.d=[[0,_.g={comment:_.e,id:"c-0-0",open:!0,"#scope":5}]])},"#scope":3}}],[1,_.l={comment:_.k,id:"c-1",open:!0,"#scope":6}]])},"#scope":0},1:_.j,2:_.h,3:_.i,4:_.f,5:_.g,6:_.l},_.g._=_.f,_.i._=_.h,_.h._=_.l._=_.j,_.m),[5,"packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_open",2,"packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_open",6,"packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_open",])
+      (M$h=[]).push(_=&gt;(_.m={0:{"#childScope/0":_.j={input:{comments:[_.b={text:"Hello World",comments:_.d=[_.f={text:"testing 123"}]},_.k={text:"Goodbye World"}]},"#ul/0(":new Map(_.a=[[0,_.c={comment:_.b,id:"c-0",open:!0,"#text/4!":_.i={"#childScope/0":_.g={input:{comments:_.d,path:"c-0"},"#ul/0(":new Map(_.e=[[0,_.h={comment:_.f,id:"c-0-0",open:!0}]])}}}],[1,_.l={comment:_.k,id:"c-1",open:!0}]])}},1:_.j,2:_.c,3:_.i,4:_.g,5:_.h,6:_.l},_.c["#text/4("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_2_renderer"](_.c),_.h._=_.g,_.i._=_.c,_.c._=_.l._=_.j,_.m),[5,"packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_open",2,"packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_open",6,"packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko_1_open",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.js
index 52f95c288..184bc9d02 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
-import { data as _data, bindRenderer as _bindRenderer, inChild as _inChild, createRenderer as _createRenderer, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, register as _register, dynamicSubscribers as _dynamicSubscribers, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { data as _data, bindRenderer as _bindRenderer, inChild as _inChild, createRenderer as _createRenderer, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, registerRenderer as _registerRenderer, dynamicSubscribers as _dynamicSubscribers, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 import { _setup_ as _layout, _renderBody_ as _layout_renderBody, _template_ as _layout_template, _walks_ as _layout_walks } from "./components/layout.marko";
 const _name$layoutBody = _registerSubscriber("packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_name/subscriber", /* @__PURE__ */_dynamicClosure("name", (_scope, name) => _data(_scope["#text/0"], name)));
-const _layoutBody = _register("packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<h1>Hello <!></h1>", /* next(1), over(1), replace */"Db%", void 0, [_name$layoutBody]));
+const _layoutBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<h1>Hello <!></h1>", /* next(1), over(1), replace */"Db%", void 0, [_name$layoutBody]));
 export const _name_ = /* @__PURE__ */_value("name", null, _dynamicSubscribers("name"));
 export const _input_ = /* @__PURE__ */_value("input", (_scope, input) => _name_(_scope, input.name), _name_);
 export const _params__ = /* @__PURE__ */_value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), _input_);
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/template.js
index 90008336a..961d112e3 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, peekNextScope as _peekNextScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, peekNextScope as _peekNextScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _layout from "./components/layout.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
@@ -7,14 +7,14 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   } = input;
   const _childScope = _peekNextScope();
   _layout._({
-    renderBody: /* @__PURE__ */_createRenderer(() => {
+    renderBody: _register( /* @__PURE__ */_createRenderer(() => {
       const _scope1_id = _nextScopeId();
       _write(`<h1>Hello <!>${_escapeXML(name)}${_markResumeNode(_scope1_id, "#text/0")}</h1>`);
       _writeEffect(_scope1_id, "packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_name/subscriber");
       _writeScope(_scope1_id, {
         "_": _ensureScopeWithId(_scope0_id)
       });
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_renderer", _scope0_id)
   });
   _writeScope(_scope0_id, {
     "name": name,
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/resume.expected.md
index 7e9b96669..00443fda7 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/resume.expected.md
@@ -12,7 +12,7 @@
     </h1>
     <!--M]1 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,name:"World","#childScope/0":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_name/subscriber",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={name:"World","#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_name/subscriber",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/ssr.expected.md
index f2f3ea5e8..739cf878f 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-layout/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <body><!M[2><h1>Hello <!>World<!M*2 #text/0></h1><!M]1 #text/0></body><script>(M$h=[]).push(_=>(_.d={0:_.a={"#scope":0,name:"World","#childScope/0":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_name/subscriber",])</script>
+  <body><!M[2><h1>Hello <!>World<!M*2 #text/0></h1><!M]1 #text/0></body><script>(M$h=[]).push(_=>(_.d={0:_.a={name:"World","#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_name/subscriber",])</script>
 
 
 # Render "End"
@@ -16,7 +16,7 @@
     </h1>
     <!--M]1 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,name:"World","#childScope/0":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_name/subscriber",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={name:"World","#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-layout/template.marko_1_name/subscriber",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.js
index 96898edb6..993a8c8d7 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.js
@@ -1,4 +1,4 @@
-import { on as _on, queueSource as _queueSource, data as _data, bindRenderer as _bindRenderer, inChild as _inChild, createRenderer as _createRenderer, register as _register, queueEffect as _queueEffect, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, dynamicSubscribers as _dynamicSubscribers, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { on as _on, queueSource as _queueSource, data as _data, bindRenderer as _bindRenderer, inChild as _inChild, createRenderer as _createRenderer, register as _register, queueEffect as _queueEffect, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, registerRenderer as _registerRenderer, dynamicSubscribers as _dynamicSubscribers, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 import { _setup_ as _child, _input_ as _child_input, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
 const _onClick = _scope => {
   const {
@@ -15,7 +15,7 @@ const _count$childBody = _registerSubscriber("packages/translator-tags/src/__tes
   _data(_scope["#text/1"], count);
   _queueEffect(_scope, _count$childBody_effect);
 }));
-const _childBody = _register("packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<button> </button>", /* get, next(1), get */" D ", void 0, [_count$childBody]));
+const _childBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<button> </button>", /* get, next(1), get */" D ", void 0, [_count$childBody]));
 const _count = /* @__PURE__ */_value("count", null, _dynamicSubscribers("count"));
 const _setup = _scope => {
   _child(_scope["#childScope/0"]);
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/template.js
index 5f15c7e5b..04ec3763c 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/template.js
@@ -1,11 +1,11 @@
-import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, peekNextScope as _peekNextScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, peekNextScope as _peekNextScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _child from "./components/child.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
   const count = 0;
   const _childScope = _peekNextScope();
   _child._({
-    renderBody: /* @__PURE__ */_createRenderer(() => {
+    renderBody: _register( /* @__PURE__ */_createRenderer(() => {
       const _scope1_id = _nextScopeId();
       _write(`<button>${_escapeXML(count)}${_markResumeNode(_scope1_id, "#text/1")}</button>${_markResumeNode(_scope1_id, "#button/0")}`);
       _writeEffect(_scope1_id, "packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber");
@@ -13,7 +13,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
       _writeScope(_scope1_id, {
         "_": _ensureScopeWithId(_scope0_id)
       });
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_renderer", _scope0_id)
   });
   _writeScope(_scope0_id, {
     "count": count,
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/resume.expected.md
index 235d8f075..572c8154b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     <!--M*2 #button/0-->
     <!--M]1 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,count:0,"#childScope/0":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count",])
     </script>
   </body>
 </html>
@@ -39,7 +39,7 @@ container.querySelector("button").click()
     <!--M*2 #button/0-->
     <!--M]1 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,count:0,"#childScope/0":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count",])
     </script>
   </body>
 </html>
@@ -66,7 +66,7 @@ container.querySelector("button").click()
     <!--M*2 #button/0-->
     <!--M]1 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,count:0,"#childScope/0":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count",])
     </script>
   </body>
 </html>
@@ -93,7 +93,7 @@ container.querySelector("button").click()
     <!--M*2 #button/0-->
     <!--M]1 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,count:0,"#childScope/0":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/ssr.expected.md
index f49f495bd..166321d14 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[2><button>0<!M*2 #text/1></button><!M*2 #button/0><!M]1 #text/0><script>(M$h=[]).push(_=>(_.d={0:_.a={"#scope":0,count:0,"#childScope/0":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count",])</script>
+  <!M[2><button>0<!M*2 #text/1></button><!M*2 #button/0><!M]1 #text/0><script>(M$h=[]).push(_=>(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count",])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
     <!--M*2 #button/0-->
     <!--M]1 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,count:0,"#childScope/0":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/template.marko_1_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/template.js
index 14151bfe3..434ebcf44 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/template.js
@@ -1,5 +1,5 @@
 import Child from "./components/child.marko";
-import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, register as _register, queueEffect as _queueEffect, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, dynamicTagAttrs as _dynamicTagAttrs, conditional as _conditional, dynamicSubscribers as _dynamicSubscribers, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, register as _register, queueEffect as _queueEffect, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, registerRenderer as _registerRenderer, dynamicTagAttrs as _dynamicTagAttrs, conditional as _conditional, dynamicSubscribers as _dynamicSubscribers, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 const _onClick = _scope => {
   const {
     _: {
@@ -15,7 +15,7 @@ const _count$falseChildBody = _registerSubscriber("packages/translator-tags/src/
   _data(_scope["#text/1"], count);
   _queueEffect(_scope, _count$falseChildBody_effect);
 }));
-const _falseChildBody = _register("packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<button> </button>", /* get, next(1), get */" D ", void 0, [_count$falseChildBody]));
+const _falseChildBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<button> </button>", /* get, next(1), get */" D ", void 0, [_count$falseChildBody]));
 const _falseChild_input = _dynamicTagAttrs("#text/0", _falseChildBody);
 const _dynamicTagName = /* @__PURE__ */_conditional("#text/0", _scope => _falseChild_input(_scope, () => ({})), _falseChild_input);
 const _count = /* @__PURE__ */_value("count", null, _dynamicSubscribers("count"));
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/template.js
index cadf02639..2476dbb0f 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/template.js
@@ -11,7 +11,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     _writeScope(_scope1_id, {
       "_": _ensureScopeWithId(_scope0_id)
     });
-  }), "packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"));
+  }), "packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer", _scope0_id));
   _write(`${_markResumeControlEnd(_scope0_id, "#text/0")}`);
   _writeScope(_scope0_id, {
     "count": count,
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md
index 619019046..710f4cc71 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md
@@ -13,7 +13,7 @@
     <!--M]1 #text/0-->
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,count:0,"#text/0!":_.c={"#scope":1,"#text/0!":_.b={"#scope":2},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"]},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count",])
     </script>
   </body>
 </html>
@@ -45,7 +45,7 @@ container.querySelector("button").click()
     <!--M]1 #text/0-->
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,count:0,"#text/0!":_.c={"#scope":1,"#text/0!":_.b={"#scope":2},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"]},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count",])
     </script>
   </body>
 </html>
@@ -74,7 +74,7 @@ container.querySelector("button").click()
     <!--M]1 #text/0-->
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,count:0,"#text/0!":_.c={"#scope":1,"#text/0!":_.b={"#scope":2},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"]},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count",])
     </script>
   </body>
 </html>
@@ -103,7 +103,7 @@ container.querySelector("button").click()
     <!--M]1 #text/0-->
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,count:0,"#text/0!":_.c={"#scope":1,"#text/0!":_.b={"#scope":2},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"]},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md
index fddd2e809..134ec71fb 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[1><!M[2><button>0<!M*2 #text/1></button><!M*2 #button/0><!M]1 #text/0><!M]0 #text/0><script>(M$h=[]).push(_=>(_.d={0:_.a={"#scope":0,count:0,"#text/0!":_.c={"#scope":1,"#text/0!":_.b={"#scope":2},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"]},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count",])</script>
+  <!M[1><!M[2><button>0<!M*2 #text/1></button><!M*2 #button/0><!M]1 #text/0><!M]0 #text/0><script>(M$h=[]).push(_=>(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count",])</script>
 
 
 # Render "End"
@@ -17,7 +17,7 @@
     <!--M]1 #text/0-->
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,count:0,"#text/0!":_.c={"#scope":1,"#text/0!":_.b={"#scope":2},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"]},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_renderer"](_.a),_.d),[2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/template.marko_1_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/resume.expected.md
index d9e1d374f..017e95125 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/resume.expected.md
@@ -64,7 +64,7 @@
     </button>
     <!--M*12 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.o={0:_.b={"#scope":0,"#text/0(":new Map(_.a=[[0,_.c={num:1,"#scope":1}],[1,_.d={num:2,"#scope":2}],[2,_.e={num:3,"#scope":3}],[3,_.f={num:4,"#scope":4}],[4,_.g={num:5,"#scope":5}],[5,_.h={num:6,"#scope":6}],[6,_.i={num:7,"#scope":7}],[7,_.j={num:8,"#scope":8}],[8,_.k={num:9,"#scope":9}],[9,_.l={num:10,"#scope":10}],[10,_.m={num:11,"#scope":11}],[11,_.n={num:12,"#scope":12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",3,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",4,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",5,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",6,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",7,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",8,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",9,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",10,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",11,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",12,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",])
+      (M$h=[]).push(_=&gt;(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",3,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",4,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",5,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",6,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",7,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",8,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",9,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",10,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",11,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",12,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",])
     </script>
   </body>
 </html>
@@ -157,7 +157,7 @@ c => click(c, 2)
     </button>
     <!--M*12 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.o={0:_.b={"#scope":0,"#text/0(":new Map(_.a=[[0,_.c={num:1,"#scope":1}],[1,_.d={num:2,"#scope":2}],[2,_.e={num:3,"#scope":3}],[3,_.f={num:4,"#scope":4}],[4,_.g={num:5,"#scope":5}],[5,_.h={num:6,"#scope":6}],[6,_.i={num:7,"#scope":7}],[7,_.j={num:8,"#scope":8}],[8,_.k={num:9,"#scope":9}],[9,_.l={num:10,"#scope":10}],[10,_.m={num:11,"#scope":11}],[11,_.n={num:12,"#scope":12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",3,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",4,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",5,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",6,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",7,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",8,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",9,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",10,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",11,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",12,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",])
+      (M$h=[]).push(_=&gt;(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",3,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",4,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",5,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",6,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",7,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",8,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",9,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",10,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",11,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",12,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",])
     </script>
   </body>
 </html>
@@ -252,7 +252,7 @@ c => click(c, 3)
     </button>
     <!--M*12 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.o={0:_.b={"#scope":0,"#text/0(":new Map(_.a=[[0,_.c={num:1,"#scope":1}],[1,_.d={num:2,"#scope":2}],[2,_.e={num:3,"#scope":3}],[3,_.f={num:4,"#scope":4}],[4,_.g={num:5,"#scope":5}],[5,_.h={num:6,"#scope":6}],[6,_.i={num:7,"#scope":7}],[7,_.j={num:8,"#scope":8}],[8,_.k={num:9,"#scope":9}],[9,_.l={num:10,"#scope":10}],[10,_.m={num:11,"#scope":11}],[11,_.n={num:12,"#scope":12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",3,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",4,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",5,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",6,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",7,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",8,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",9,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",10,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",11,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",12,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",])
+      (M$h=[]).push(_=&gt;(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",3,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",4,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",5,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",6,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",7,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",8,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",9,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",10,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",11,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",12,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",])
     </script>
   </body>
 </html>
@@ -346,7 +346,7 @@ c => click(c, 5)
     </button>
     <!--M*12 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.o={0:_.b={"#scope":0,"#text/0(":new Map(_.a=[[0,_.c={num:1,"#scope":1}],[1,_.d={num:2,"#scope":2}],[2,_.e={num:3,"#scope":3}],[3,_.f={num:4,"#scope":4}],[4,_.g={num:5,"#scope":5}],[5,_.h={num:6,"#scope":6}],[6,_.i={num:7,"#scope":7}],[7,_.j={num:8,"#scope":8}],[8,_.k={num:9,"#scope":9}],[9,_.l={num:10,"#scope":10}],[10,_.m={num:11,"#scope":11}],[11,_.n={num:12,"#scope":12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",3,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",4,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",5,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",6,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",7,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",8,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",9,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",10,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",11,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",12,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",])
+      (M$h=[]).push(_=&gt;(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",3,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",4,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",5,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",6,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",7,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",8,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",9,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",10,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",11,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",12,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/ssr.expected.md
index 4cf5e532d..87738febf 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>1<!M*1 #text/1></button><!M*1 #button/0><button>2<!M*2 #text/1></button><!M*2 #button/0><button>3<!M*3 #text/1></button><!M*3 #button/0><button>4<!M*4 #text/1></button><!M*4 #button/0><button>5<!M*5 #text/1></button><!M*5 #button/0><button>6<!M*6 #text/1></button><!M*6 #button/0><button>7<!M*7 #text/1></button><!M*7 #button/0><button>8<!M*8 #text/1></button><!M*8 #button/0><button>9<!M*9 #text/1></button><!M*9 #button/0><button>10<!M*10 #text/1></button><!M*10 #button/0><button>11<!M*11 #text/1></button><!M*11 #button/0><button>12<!M*12 #text/1></button><!M*12 #button/0><script>(M$h=[]).push(_=>(_.o={0:_.b={"#scope":0,"#text/0(":new Map(_.a=[[0,_.c={num:1,"#scope":1}],[1,_.d={num:2,"#scope":2}],[2,_.e={num:3,"#scope":3}],[3,_.f={num:4,"#scope":4}],[4,_.g={num:5,"#scope":5}],[5,_.h={num:6,"#scope":6}],[6,_.i={num:7,"#scope":7}],[7,_.j={num:8,"#scope":8}],[8,_.k={num:9,"#scope":9}],[9,_.l={num:10,"#scope":10}],[10,_.m={num:11,"#scope":11}],[11,_.n={num:12,"#scope":12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",3,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",4,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",5,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",6,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",7,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",8,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",9,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",10,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",11,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",12,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",])</script>
+  <button>1<!M*1 #text/1></button><!M*1 #button/0><button>2<!M*2 #text/1></button><!M*2 #button/0><button>3<!M*3 #text/1></button><!M*3 #button/0><button>4<!M*4 #text/1></button><!M*4 #button/0><button>5<!M*5 #text/1></button><!M*5 #button/0><button>6<!M*6 #text/1></button><!M*6 #button/0><button>7<!M*7 #text/1></button><!M*7 #button/0><button>8<!M*8 #text/1></button><!M*8 #button/0><button>9<!M*9 #text/1></button><!M*9 #button/0><button>10<!M*10 #text/1></button><!M*10 #button/0><button>11<!M*11 #text/1></button><!M*11 #button/0><button>12<!M*12 #text/1></button><!M*12 #button/0><script>(M$h=[]).push(_=>(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",3,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",4,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",5,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",6,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",7,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",8,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",9,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",10,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",11,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",12,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",])</script>
 
 
 # Render "End"
@@ -68,7 +68,7 @@
     </button>
     <!--M*12 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.o={0:_.b={"#scope":0,"#text/0(":new Map(_.a=[[0,_.c={num:1,"#scope":1}],[1,_.d={num:2,"#scope":2}],[2,_.e={num:3,"#scope":3}],[3,_.f={num:4,"#scope":4}],[4,_.g={num:5,"#scope":5}],[5,_.h={num:6,"#scope":6}],[6,_.i={num:7,"#scope":7}],[7,_.j={num:8,"#scope":8}],[8,_.k={num:9,"#scope":9}],[9,_.l={num:10,"#scope":10}],[10,_.m={num:11,"#scope":11}],[11,_.n={num:12,"#scope":12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",3,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",4,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",5,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",6,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",7,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",8,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",9,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",10,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",11,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",12,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",])
+      (M$h=[]).push(_=&gt;(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",2,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",3,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",4,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",5,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",6,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",7,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",8,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",9,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",10,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",11,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",12,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-for/template.marko_1_num",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/dom.expected/template.js
index 31b9e9e07..37eb10f2d 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
-import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, closure as _closure, register as _register, queueEffect as _queueEffect, conditional as _conditional, inConditionalScope as _inConditionalScope, intersections as _intersections, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, closure as _closure, registerRenderer as _registerRenderer, register as _register, queueEffect as _queueEffect, conditional as _conditional, inConditionalScope as _inConditionalScope, intersections as _intersections, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 const _clickCount$elseBody = /* @__PURE__ */_closure("clickCount", (_scope, clickCount) => _data(_scope["#text/0"], clickCount));
-const _elseBody = _register("packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_2_renderer", /* @__PURE__ */_createRenderer("<span>The button was clicked <!> times.</span>", /* next(1), over(1), replace */"Db%", void 0, [_clickCount$elseBody]));
+const _elseBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_2_renderer", /* @__PURE__ */_createRenderer("<span>The button was clicked <!> times.</span>", /* next(1), over(1), replace */"Db%", void 0, [_clickCount$elseBody]));
 const _onClick = _scope => {
   const {
     _: {
@@ -16,7 +16,7 @@ const _clickCount$ifBody = /* @__PURE__ */_closure("clickCount", (_scope, clickC
   _data(_scope["#text/1"], clickCount);
   _queueEffect(_scope, _clickCount$ifBody_effect);
 });
-const _ifBody = _register("packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<button> </button>", /* get, next(1), get */" D ", void 0, [_clickCount$ifBody]));
+const _ifBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<button> </button>", /* get, next(1), get */" D ", void 0, [_clickCount$ifBody]));
 const _if = /* @__PURE__ */_conditional("#text/0");
 const _clickCount = /* @__PURE__ */_value("clickCount", (_scope, clickCount) => _if(_scope, clickCount < 3 ? _ifBody : _elseBody), _intersections([_if, _inConditionalScope(_clickCount$ifBody, "#text/0"), _inConditionalScope(_clickCount$elseBody, "#text/0")]));
 const _setup = _scope => {
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/html.expected/template.js
index 98e3eaa87..248afa221 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/html.expected/template.js
@@ -11,7 +11,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     _writeScope(_scope1_id, {
       "_": _ensureScopeWithId(_scope0_id)
     });
-    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer");
+    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer", _scope0_id);
     _ifScopeId = _scope1_id;
   } else {
     const _scope2_id = _nextScopeId();
@@ -19,7 +19,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     _writeScope(_scope2_id, {
       "_": _ensureScopeWithId(_scope0_id)
     });
-    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_2_renderer");
+    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_2_renderer", _scope0_id);
     _ifScopeId = _scope2_id;
   }
   _write(`${_markResumeControlSingleNodeEnd(_scope0_id, "#text/0", _ifScopeId)}</div>`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/resume.expected.md
index d37a28871..d6521af1b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/resume.expected.md
@@ -12,7 +12,7 @@
       <!--M|0 #text/0 1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer"],"#text/0!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_clickCount",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#text/0!":_.b={}},1:_.b},_.a["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_clickCount",])
     </script>
   </body>
 </html>
@@ -34,13 +34,12 @@ container.querySelector("button").click()
     <div>
       <button>
         1
-        <!--M*1 #text/1-->
       </button>
       <!--M*1 #button/0-->
       <!--M|0 #text/0 1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer"],"#text/0!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_clickCount",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#text/0!":_.b={}},1:_.b},_.a["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_clickCount",])
     </script>
   </body>
 </html>
@@ -48,7 +47,9 @@ container.querySelector("button").click()
 
 # Mutations
 ```
-#document/html0/body1/div0/button0/#text0: "0" => "1"
+inserted #document/html0/body1/div0/button0
+removed button after #document/html0/body1/div0/button0
+#document/html0/body1/div0/button0/#text0: " " => "1"
 ```
 
 
@@ -62,13 +63,12 @@ container.querySelector("button").click()
     <div>
       <button>
         2
-        <!--M*1 #text/1-->
       </button>
       <!--M*1 #button/0-->
       <!--M|0 #text/0 1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer"],"#text/0!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_clickCount",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#text/0!":_.b={}},1:_.b},_.a["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_clickCount",])
     </script>
   </body>
 </html>
@@ -95,7 +95,7 @@ container.querySelector("button").click()
       <!--M|0 #text/0 1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer"],"#text/0!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_clickCount",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#text/0!":_.b={}},1:_.b},_.a["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/ssr.expected.md
index 490502767..9ba79edd8 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><button>0<!M*1 #text/1></button><!M*1 #button/0><!M|0 #text/0 1></div><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,clickCount:0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer"],"#text/0!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_clickCount",])</script>
+  <div><button>0<!M*1 #text/1></button><!M*1 #button/0><!M|0 #text/0 1></div><script>(M$h=[]).push(_=>(_.c={0:_.a={clickCount:0,"#text/0!":_.b={}},1:_.b},_.a["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_clickCount",])</script>
 
 
 # Render "End"
@@ -16,7 +16,7 @@
       <!--M|0 #text/0 1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,clickCount:0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer"],"#text/0!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_clickCount",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={clickCount:0,"#text/0!":_.b={}},1:_.b},_.a["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/basic-nested-scope-if/template.marko_1_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/resume.expected.md
index 9daf57f76..9bcd9f931 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/resume.expected.md
@@ -19,7 +19,7 @@
       <!--M*0 #button/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{id:0,items:[],"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])
+      (M$h=[]).push(_=&gt;(_.a={0:{id:0,items:[]}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])
     </script>
   </body>
 </html>
@@ -54,7 +54,7 @@ container.querySelector("#add").click()
       <!--M*0 #button/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{id:0,items:[],"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])
+      (M$h=[]).push(_=&gt;(_.a={0:{id:0,items:[]}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])
     </script>
   </body>
 </html>
@@ -90,7 +90,7 @@ container.querySelector("#add").click()
       <!--M*0 #button/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{id:0,items:[],"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])
+      (M$h=[]).push(_=&gt;(_.a={0:{id:0,items:[]}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])
     </script>
   </body>
 </html>
@@ -125,7 +125,7 @@ container.querySelector("#remove").click()
       <!--M*0 #button/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{id:0,items:[],"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])
+      (M$h=[]).push(_=&gt;(_.a={0:{id:0,items:[]}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])
     </script>
   </body>
 </html>
@@ -160,7 +160,7 @@ container.querySelector("#add").click()
       <!--M*0 #button/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{id:0,items:[],"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])
+      (M$h=[]).push(_=&gt;(_.a={0:{id:0,items:[]}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/ssr.expected.md
index 1ef4f0a4a..3afc81cdc 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><!M|0 #text/0 ><button id=add>Add</button><!M*0 #button/1><button id=remove>Remove</button><!M*0 #button/2></div><script>(M$h=[]).push(_=>(_.a={0:{id:0,items:[],"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])</script>
+  <div><!M|0 #text/0 ><button id=add>Add</button><!M*0 #button/1><button id=remove>Remove</button><!M*0 #button/2></div><script>(M$h=[]).push(_=>(_.a={0:{id:0,items:[]}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])</script>
 
 
 # Render "End"
@@ -23,7 +23,7 @@
       <!--M*0 #button/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{id:0,items:[],"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])
+      (M$h=[]).push(_=&gt;(_.a={0:{id:0,items:[]}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_items",0,"packages/translator-tags/src/__tests__/fixtures/basic-push-pop-list/template.marko_0_id_items",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/resume.expected.md
index 6364c09cd..7a642ed96 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/resume.expected.md
@@ -32,7 +32,7 @@
     </button>
     <!--M*0 #button/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_list",0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_open",])
+      (M$h=[]).push(_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_list",0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_open",])
     </script>
   </body>
 </html>
@@ -82,7 +82,7 @@ container.querySelector("#toggle").click()
     </button>
     <!--M*0 #button/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_list",0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_open",])
+      (M$h=[]).push(_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_list",0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_open",])
     </script>
   </body>
 </html>
@@ -130,7 +130,7 @@ container.querySelector("#toggle").click()
     </button>
     <!--M*0 #button/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_list",0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_open",])
+      (M$h=[]).push(_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_list",0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_open",])
     </script>
   </body>
 </html>
@@ -178,7 +178,7 @@ container.querySelector("#reverse").click()
     </button>
     <!--M*0 #button/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_list",0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_open",])
+      (M$h=[]).push(_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_list",0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_open",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/ssr.expected.md
index 56092879d..93ecc09b3 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <ul><li>1<!M*1 #text/0></li><li>2<!M*2 #text/0></li><li>3<!M*3 #text/0></li><!M|0 #ul/0 1,2,3></ul><!M*0 #ul/0><button id=toggle>Toggle</button><!M*0 #button/1><button id=reverse>Reverse</button><!M*0 #button/2><script>(M$h=[]).push(_=>(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_list",0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_open",])</script>
+  <ul><li>1<!M*1 #text/0></li><li>2<!M*2 #text/0></li><li>3<!M*3 #text/0></li><!M|0 #ul/0 1,2,3></ul><!M*0 #ul/0><button id=toggle>Toggle</button><!M*0 #button/1><button id=reverse>Reverse</button><!M*0 #button/2><script>(M$h=[]).push(_=>(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_list",0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_open",])</script>
 
 
 # Render "End"
@@ -36,7 +36,7 @@
     </button>
     <!--M*0 #button/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_list",0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_open",])
+      (M$h=[]).push(_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_list",0,"packages/translator-tags/src/__tests__/fixtures/basic-shared-node-ref/template.marko_0_open",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/resume.expected.md
index 411b61c21..b5311d3ef 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/resume.expected.md
@@ -12,7 +12,7 @@
       <!--M*0 #button/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{show:!0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_1_renderer"],"#text/0!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.b={0:{show:!0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_1_renderer"],"#text/0!":_.a={}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_0_show",])
     </script>
   </body>
 </html>
@@ -39,7 +39,7 @@ container.querySelector("button").click()
       <!--M*0 #button/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{show:!0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_1_renderer"],"#text/0!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.b={0:{show:!0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_1_renderer"],"#text/0!":_.a={}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_0_show",])
     </script>
   </body>
 </html>
@@ -68,7 +68,7 @@ container.querySelector("button").click()
       <!--M*0 #button/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{show:!0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_1_renderer"],"#text/0!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.b={0:{show:!0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_1_renderer"],"#text/0!":_.a={}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_0_show",])
     </script>
   </body>
 </html>
@@ -96,7 +96,7 @@ container.querySelector("button").click()
       <!--M*0 #button/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{show:!0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_1_renderer"],"#text/0!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.b={0:{show:!0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_1_renderer"],"#text/0!":_.a={}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_0_show",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/ssr.expected.md
index 4f98e035e..c7ccb6ea4 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div>Hello!<!M|0 #text/0 1><button>Toggle</button><!M*0 #button/1></div><script>(M$h=[]).push(_=>(_.b={0:{show:!0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_1_renderer"],"#text/0!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_0_show",])</script>
+  <div>Hello!<!M|0 #text/0 1><button>Toggle</button><!M*0 #button/1></div><script>(M$h=[]).push(_=>(_.b={0:{show:!0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_1_renderer"],"#text/0!":_.a={}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_0_show",])</script>
 
 
 # Render "End"
@@ -16,7 +16,7 @@
       <!--M*0 #button/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{show:!0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_1_renderer"],"#text/0!":_.a={"#scope":1},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.b={0:{show:!0,"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_1_renderer"],"#text/0!":_.a={}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-toggle-show/template.marko_0_show",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/resume.expected.md
index a25063d6e..f7d2a529e 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -38,7 +38,7 @@ container.querySelector("button").click()
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -65,7 +65,7 @@ container.querySelector("button").click()
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -92,7 +92,7 @@ container.querySelector("button").click()
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/ssr.expected.md
index 1044819ec..8c101ea8b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><button>0<!M*0 #text/1></button><!M*0 #button/0></div><script>(M$h=[]).push(_=>(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/template.marko_0_clickCount",])</script>
+  <div><button>0<!M*0 #text/1></button><!M*0 #button/0></div><script>(M$h=[]).push(_=>(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/template.marko_0_clickCount",])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/basic-unused-ref/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/dom.expected/template.js
index f381b9bd8..6af5000aa 100644
--- a/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
-import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, closure as _closure, register as _register, conditional as _conditional, inConditionalScope as _inConditionalScope, value as _value, queueEffect as _queueEffect, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, closure as _closure, registerRenderer as _registerRenderer, conditional as _conditional, inConditionalScope as _inConditionalScope, value as _value, register as _register, queueEffect as _queueEffect, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 const _message$ifBody = /* @__PURE__ */_closure("message", (_scope, message) => _data(_scope["#text/0"], message));
-const _ifBody = _register("packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<span> </span>", /* next(1), get */"D ", void 0, [_message$ifBody]));
+const _ifBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<span> </span>", /* next(1), get */"D ", void 0, [_message$ifBody]));
 const _if = /* @__PURE__ */_conditional("#text/1");
 const _message = /* @__PURE__ */_value("message", null, _inConditionalScope(_message$ifBody, "#text/1"));
 const _onClick = _scope => {
diff --git a/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/html.expected/template.js
index 1a7e5edb7..487d80f80 100644
--- a/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/html.expected/template.js
@@ -11,7 +11,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     _writeScope(_scope1_id, {
       "_": _ensureScopeWithId(_scope0_id)
     });
-    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_1_renderer");
+    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_1_renderer", _scope0_id);
     _ifScopeId = _scope1_id;
   }
   _write(`${_markResumeControlSingleNodeEnd(_scope0_id, "#text/1", _ifScopeId)}`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/resume.expected.md
index c4d9f2d91..dd0bad0dc 100644
--- a/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     </span>
     <!--M|0 #text/1 1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,message:"hi","#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,message:"hi","#text/1!":_.b={}},1:_.b},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_0_show",])
     </script>
   </body>
 </html>
@@ -34,7 +34,7 @@ container.querySelector("button").click()
     <!--M*0 #button/0-->
     <!--M|0 #text/1 1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,message:"hi","#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,message:"hi","#text/1!":_.b={}},1:_.b},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_0_show",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/ssr.expected.md
index 358a88fac..d39025018 100644
--- a/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button></button><!M*0 #button/0><span>hi<!M*1 #text/0></span><!M|0 #text/1 1><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,show:!0,message:"hi","#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_0_show",])</script>
+  <button></button><!M*0 #button/0><span>hi<!M*1 #text/0></span><!M|0 #text/1 1><script>(M$h=[]).push(_=>(_.c={0:_.a={show:!0,message:"hi","#text/1!":_.b={}},1:_.b},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_0_show",])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
     </span>
     <!--M|0 #text/1 1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,show:!0,message:"hi","#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={show:!0,message:"hi","#text/1!":_.b={}},1:_.b},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates-cleanup/template.marko_0_show",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/batched-updates/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/batched-updates/__snapshots__/resume.expected.md
index ffa5852ed..331e3319a 100644
--- a/packages/translator-tags/src/__tests__/fixtures/batched-updates/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/batched-updates/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates/template.marko_0_a_b",])
+      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates/template.marko_0_a_b",])
     </script>
   </body>
 </html>
@@ -34,7 +34,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates/template.marko_0_a_b",])
+      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates/template.marko_0_a_b",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/batched-updates/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/batched-updates/__snapshots__/ssr.expected.md
index 5cfb523cb..415bb5783 100644
--- a/packages/translator-tags/src/__tests__/fixtures/batched-updates/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/batched-updates/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>0<!M*0 #text/1></button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{a:0,b:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates/template.marko_0_a_b",])</script>
+  <button>0<!M*0 #text/1></button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{a:0,b:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates/template.marko_0_a_b",])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates/template.marko_0_a_b",])
+      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/batched-updates/template.marko_0_a_b",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/template.js
index b46b28b5d..ed1e2d913 100644
--- a/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/template.js
@@ -1,4 +1,4 @@
-import { queueSource as _queueSource, data as _data, register as _register, bindRenderer as _bindRenderer, inChild as _inChild, createRenderer as _createRenderer, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, dynamicSubscribers as _dynamicSubscribers, intersections as _intersections, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { queueSource as _queueSource, data as _data, register as _register, bindRenderer as _bindRenderer, inChild as _inChild, createRenderer as _createRenderer, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, registerRenderer as _registerRenderer, dynamicSubscribers as _dynamicSubscribers, intersections as _intersections, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 import { _setup_ as _FancyButton, _input_ as _FancyButton_input, _template_ as _FancyButton_template, _walks_ as _FancyButton_walks } from "./components/FancyButton.marko";
 const _onClick = _register("packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick", _scope => {
   const {
@@ -9,7 +9,7 @@ const _onClick = _register("packages/translator-tags/src/__tests__/fixtures/body
   };
 });
 const _clickCount$FancyButtonBody = _registerSubscriber("packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber", /* @__PURE__ */_dynamicClosure("clickCount", (_scope, clickCount) => _data(_scope["#text/0"], clickCount)));
-const _FancyButtonBody = _register("packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_renderer", /* @__PURE__ */_createRenderer(" ", /* get */" ", void 0, [_clickCount$FancyButtonBody]));
+const _FancyButtonBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_renderer", /* @__PURE__ */_createRenderer(" ", /* get */" ", void 0, [_clickCount$FancyButtonBody]));
 const _clickCount = /* @__PURE__ */_value("clickCount", (_scope, clickCount) => _FancyButton_input(_scope["#childScope/0"], {
   onClick: _onClick(_scope),
   renderBody: /* @__PURE__ */_bindRenderer(_scope, _FancyButtonBody)
diff --git a/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/template.js
index 0afd50922..ce5f9c432 100644
--- a/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/template.js
@@ -8,14 +8,14 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     onClick: _register(function () {
       clickCount++;
     }, "packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick", _scope0_id),
-    renderBody: /* @__PURE__ */_createRenderer(() => {
+    renderBody: _register( /* @__PURE__ */_createRenderer(() => {
       const _scope1_id = _nextScopeId();
       _write(`${_escapeXML(clickCount)}${_markResumeNode(_scope1_id, "#text/0")}`);
       _writeEffect(_scope1_id, "packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber");
       _writeScope(_scope1_id, {
         "_": _ensureScopeWithId(_scope0_id)
       });
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_renderer", _scope0_id)
   });
   _writeScope(_scope0_id, {
     "clickCount": clickCount,
diff --git a/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md
index 7019a2980..08b3f1958 100644
--- a/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.f={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.e={"#scope":1,"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={"#scope":2}}},1:_.e,2:_.d},_.b.click=_.c.onClick=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick"](_.a),_.d._=_.a,_.f),[2,"packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko_0_attrs",])
+      (M$h=[]).push(_=&gt;(_.f={0:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={}}},1:_.e,2:_.d},_.b.click=_.c.onClick=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick"](_.a),_.d._=_.a,_.e["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_renderer"](_.a),_.f),[2,"packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko_0_attrs",])
     </script>
   </body>
 </html>
@@ -31,12 +31,14 @@ container.querySelector("button").click()
   <head />
   <body>
     <button>
+      <!--M[2-->
       1
+      <!--M*2 #text/0-->
       <!--M]1 #text/1-->
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.f={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.e={"#scope":1,"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={"#scope":2}}},1:_.e,2:_.d},_.b.click=_.c.onClick=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick"](_.a),_.d._=_.a,_.f),[2,"packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko_0_attrs",])
+      (M$h=[]).push(_=&gt;(_.f={0:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={}}},1:_.e,2:_.d},_.b.click=_.c.onClick=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick"](_.a),_.d._=_.a,_.e["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_renderer"](_.a),_.f),[2,"packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko_0_attrs",])
     </script>
   </body>
 </html>
@@ -44,11 +46,7 @@ container.querySelector("button").click()
 
 # Mutations
 ```
-inserted #document/html0/body1/button0/#text0
-removed #comment after #document/html0/body1/button0/#text0
-removed #text after #document/html0/body1/button0/#text0
-removed #comment after #document/html0/body1/button0/#text0
-#document/html0/body1/button0/#text0: " " => "1"
+#document/html0/body1/button0/#text1: "0" => "1"
 ```
 
 
@@ -60,12 +58,14 @@ container.querySelector("button").click()
   <head />
   <body>
     <button>
+      <!--M[2-->
       2
+      <!--M*2 #text/0-->
       <!--M]1 #text/1-->
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.f={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.e={"#scope":1,"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={"#scope":2}}},1:_.e,2:_.d},_.b.click=_.c.onClick=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick"](_.a),_.d._=_.a,_.f),[2,"packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko_0_attrs",])
+      (M$h=[]).push(_=&gt;(_.f={0:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={}}},1:_.e,2:_.d},_.b.click=_.c.onClick=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick"](_.a),_.d._=_.a,_.e["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_renderer"](_.a),_.f),[2,"packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko_0_attrs",])
     </script>
   </body>
 </html>
@@ -73,7 +73,7 @@ container.querySelector("button").click()
 
 # Mutations
 ```
-#document/html0/body1/button0/#text0: "1" => "2"
+#document/html0/body1/button0/#text1: "1" => "2"
 ```
 
 
@@ -85,12 +85,14 @@ container.querySelector("button").click()
   <head />
   <body>
     <button>
+      <!--M[2-->
       3
+      <!--M*2 #text/0-->
       <!--M]1 #text/1-->
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.f={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.e={"#scope":1,"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={"#scope":2}}},1:_.e,2:_.d},_.b.click=_.c.onClick=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick"](_.a),_.d._=_.a,_.f),[2,"packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko_0_attrs",])
+      (M$h=[]).push(_=&gt;(_.f={0:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={}}},1:_.e,2:_.d},_.b.click=_.c.onClick=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick"](_.a),_.d._=_.a,_.e["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_renderer"](_.a),_.f),[2,"packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko_0_attrs",])
     </script>
   </body>
 </html>
@@ -98,5 +100,5 @@ container.querySelector("button").click()
 
 # Mutations
 ```
-#document/html0/body1/button0/#text0: "2" => "3"
+#document/html0/body1/button0/#text1: "2" => "3"
 ```
\ No newline at end of file
diff --git a/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md
index 4c07a4e67..80a703f32 100644
--- a/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button><!M[2>0<!M*2 #text/0><!M]1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.f={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.e={"#scope":1,"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={"#scope":2}}},1:_.e,2:_.d},_.b.click=_.c.onClick=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick"](_.a),_.d._=_.a,_.f),[2,"packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko_0_attrs",])</script>
+  <button><!M[2>0<!M*2 #text/0><!M]1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.f={0:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={}}},1:_.e,2:_.d},_.b.click=_.c.onClick=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick"](_.a),_.d._=_.a,_.e["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_renderer"](_.a),_.f),[2,"packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko_0_attrs",])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.f={0:_.a={"#scope":0,clickCount:0,"#childScope/0":_.e={"#scope":1,"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={"#scope":2}}},1:_.e,2:_.d},_.b.click=_.c.onClick=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick"](_.a),_.d._=_.a,_.f),[2,"packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko_0_attrs",])
+      (M$h=[]).push(_=&gt;(_.f={0:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={}}},1:_.e,2:_.d},_.b.click=_.c.onClick=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_0/onClick"](_.a),_.d._=_.a,_.e["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_renderer"](_.a),_.f),[2,"packages/translator-tags/src/__tests__/fixtures/body-content/template.marko_1_clickCount/subscriber",1,"packages/translator-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko_0_attrs",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/ssr.expected.md
index 7126df26a..931841784 100644
--- a/packages/translator-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>$0.00<!M*1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.b={0:{"#childScope/0":_.a={"#scope":1,input:{},count:0},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/component-attrs-import-value/components/counter.marko_0_count",])</script>
+  <button>$0.00<!M*1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.b={0:{"#childScope/0":_.a={input:{},count:0}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/component-attrs-import-value/components/counter.marko_0_count",])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={"#scope":1,input:{},count:0},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/component-attrs-import-value/components/counter.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={input:{},count:0}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/component-attrs-import-value/components/counter.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/resume.expected.md
index 16020ca21..4d79725c7 100644
--- a/packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/resume.expected.md
@@ -10,7 +10,7 @@
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#childScope/0":_.a={"#scope":1,value:0,dummy:{}},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#childScope/0":_.a={value:0,dummy:{}}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -36,7 +36,7 @@ container.querySelector("button").click()
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#childScope/0":_.a={"#scope":1,value:0,dummy:{}},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#childScope/0":_.a={value:0,dummy:{}}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/ssr.expected.md
index e8309049c..472f13304 100644
--- a/packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div>0<!M*1 #text/0></div><button></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.b={0:{count:0,"#childScope/0":_.a={"#scope":1,value:0,dummy:{}},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/template.marko_0_count",])</script>
+  <div>0<!M*1 #text/0></div><button></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.b={0:{count:0,"#childScope/0":_.a={value:0,dummy:{}}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/template.marko_0_count",])</script>
 
 
 # Render "End"
@@ -14,7 +14,7 @@
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#childScope/0":_.a={"#scope":1,value:0,dummy:{}},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{count:0,"#childScope/0":_.a={value:0,dummy:{}}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/component-attrs-intersection/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/ssr.expected.md
index f78b46046..aa21b7d65 100644
--- a/packages/translator-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>$0.00<!M*1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.b={0:{"#childScope/0":_.a={"#scope":1,input:{},count:0},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/component-attrs-static-code/components/counter.marko_0_count",])</script>
+  <button>$0.00<!M*1 #text/1></button><!M*1 #button/0><script>(M$h=[]).push(_=>(_.b={0:{"#childScope/0":_.a={input:{},count:0}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/component-attrs-static-code/components/counter.marko_0_count",])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     </button>
     <!--M*1 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={"#scope":1,input:{},count:0},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/component-attrs-static-code/components/counter.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={input:{},count:0}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/component-attrs-static-code/components/counter.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/resume.expected.md
index 7fd78a997..759d97f1d 100644
--- a/packages/translator-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/resume.expected.md
@@ -25,7 +25,7 @@
       <!--M*0 #text/4-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/counter-intersection/template.marko_0",])
+      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/counter-intersection/template.marko_0",])
     </script>
   </body>
 </html>
@@ -66,7 +66,7 @@ container.querySelector("button.a").click()
       <!--M*0 #text/4-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/counter-intersection/template.marko_0",])
+      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/counter-intersection/template.marko_0",])
     </script>
   </body>
 </html>
@@ -108,7 +108,7 @@ container.querySelector("button.b").click()
       <!--M*0 #text/4-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/counter-intersection/template.marko_0",])
+      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/counter-intersection/template.marko_0",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/ssr.expected.md
index 93cc4c385..bb6119b82 100644
--- a/packages/translator-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><button class=a>0<!M*0 #text/1></button><!M*0 #button/0> + <button class=b>0<!M*0 #text/3></button><!M*0 #button/2> = <!>0<!M*0 #text/4></div><script>(M$h=[]).push(_=>(_.a={0:{a:0,b:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/counter-intersection/template.marko_0",])</script>
+  <div><button class=a>0<!M*0 #text/1></button><!M*0 #button/0> + <button class=b>0<!M*0 #text/3></button><!M*0 #button/2> = <!>0<!M*0 #text/4></div><script>(M$h=[]).push(_=>(_.a={0:{a:0,b:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/counter-intersection/template.marko_0",])</script>
 
 
 # Render "End"
@@ -29,7 +29,7 @@
       <!--M*0 #text/4-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/counter-intersection/template.marko_0",])
+      (M$h=[]).push(_=&gt;(_.a={0:{a:0,b:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/counter-intersection/template.marko_0",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/resume.expected.md
index 2c3f42426..631dacc74 100644
--- a/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/resume.expected.md
@@ -24,7 +24,7 @@
     </div>
     <!--M*0 #div/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.f={0:{"#div/0(":new Map(_.a=[[0,_.b={"#scope":1}],[1,_.c={"#scope":2}],[2,_.d={"#scope":3}],[3,_.e={"#scope":4}]]),"#scope":0},1:_.b,2:_.c,3:_.d,4:_.e}),[])
+      (M$h=[]).push(_=&gt;(_.f={0:{"#div/0(":new Map(_.a=[[0,_.b={}],[1,_.c={}],[2,_.d={}],[3,_.e={}]])},1:_.b,2:_.c,3:_.d,4:_.e}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/ssr.expected.md
index 3930d607f..c2762ee2f 100644
--- a/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><!M[1>0<!M*1 #text/0>, <!M[2>1<!M*2 #text/0>, <!M[3>2<!M*3 #text/0>, <!M[4>3<!M*4 #text/0>, <!M]0 #div/0></div><!M*0 #div/0><script>(M$h=[]).push(_=>(_.f={0:{"#div/0(":new Map(_.a=[[0,_.b={"#scope":1}],[1,_.c={"#scope":2}],[2,_.d={"#scope":3}],[3,_.e={"#scope":4}]]),"#scope":0},1:_.b,2:_.c,3:_.d,4:_.e}),[])</script>
+  <div><!M[1>0<!M*1 #text/0>, <!M[2>1<!M*2 #text/0>, <!M[3>2<!M*3 #text/0>, <!M[4>3<!M*4 #text/0>, <!M]0 #div/0></div><!M*0 #div/0><script>(M$h=[]).push(_=>(_.f={0:{"#div/0(":new Map(_.a=[[0,_.b={}],[1,_.c={}],[2,_.d={}],[3,_.e={}]])},1:_.b,2:_.c,3:_.d,4:_.e}),[])</script>
 
 
 # Render "End"
@@ -28,7 +28,7 @@
     </div>
     <!--M*0 #div/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.f={0:{"#div/0(":new Map(_.a=[[0,_.b={"#scope":1}],[1,_.c={"#scope":2}],[2,_.d={"#scope":3}],[3,_.e={"#scope":4}]]),"#scope":0},1:_.b,2:_.c,3:_.d,4:_.e}),[])
+      (M$h=[]).push(_=&gt;(_.f={0:{"#div/0(":new Map(_.a=[[0,_.b={}],[1,_.c={}],[2,_.d={}],[3,_.e={}]])},1:_.b,2:_.c,3:_.d,4:_.e}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/resume.expected.md
index 1d693c929..e31b3b3b8 100644
--- a/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/resume.expected.md
@@ -44,7 +44,7 @@
       <!--M|0 #text/1 4,5,6-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.i={0:{"#text/0(":new Map(_.a=[["1",_.c={"#scope":1}],["2",_.d={"#scope":2}],["3",_.e={"#scope":3}]]),"#text/1(":new Map(_.b=[["1",_.f={"#scope":4}],["2",_.g={"#scope":5}],["3",_.h={"#scope":6}]]),"#scope":0},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h}),[])
+      (M$h=[]).push(_=&gt;(_.i={0:{"#text/0(":new Map(_.a=[["1",_.c={}],["2",_.d={}],["3",_.e={}]]),"#text/1(":new Map(_.b=[["1",_.f={}],["2",_.g={}],["3",_.h={}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/ssr.expected.md
index 9f0da58d7..5bb195f3f 100644
--- a/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><p>1<!M*1 #text/0>: <!>a<!M*1 #text/1></p><p>2<!M*2 #text/0>: <!>b<!M*2 #text/1></p><p>3<!M*3 #text/0>: <!>c<!M*3 #text/1></p><!M|0 #text/0 1,2,3><p>1<!M*4 #text/0></p><p>2<!M*5 #text/0></p><p>3<!M*6 #text/0></p><!M|0 #text/1 4,5,6></div><script>(M$h=[]).push(_=>(_.i={0:{"#text/0(":new Map(_.a=[["1",_.c={"#scope":1}],["2",_.d={"#scope":2}],["3",_.e={"#scope":3}]]),"#text/1(":new Map(_.b=[["1",_.f={"#scope":4}],["2",_.g={"#scope":5}],["3",_.h={"#scope":6}]]),"#scope":0},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h}),[])</script>
+  <div><p>1<!M*1 #text/0>: <!>a<!M*1 #text/1></p><p>2<!M*2 #text/0>: <!>b<!M*2 #text/1></p><p>3<!M*3 #text/0>: <!>c<!M*3 #text/1></p><!M|0 #text/0 1,2,3><p>1<!M*4 #text/0></p><p>2<!M*5 #text/0></p><p>3<!M*6 #text/0></p><!M|0 #text/1 4,5,6></div><script>(M$h=[]).push(_=>(_.i={0:{"#text/0(":new Map(_.a=[["1",_.c={}],["2",_.d={}],["3",_.e={}]]),"#text/1(":new Map(_.b=[["1",_.f={}],["2",_.g={}],["3",_.h={}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h}),[])</script>
 
 
 # Render "End"
@@ -48,7 +48,7 @@
       <!--M|0 #text/1 4,5,6-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.i={0:{"#text/0(":new Map(_.a=[["1",_.c={"#scope":1}],["2",_.d={"#scope":2}],["3",_.e={"#scope":3}]]),"#text/1(":new Map(_.b=[["1",_.f={"#scope":4}],["2",_.g={"#scope":5}],["3",_.h={"#scope":6}]]),"#scope":0},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h}),[])
+      (M$h=[]).push(_=&gt;(_.i={0:{"#text/0(":new Map(_.a=[["1",_.c={}],["2",_.d={}],["3",_.e={}]]),"#text/1(":new Map(_.b=[["1",_.f={}],["2",_.g={}],["3",_.h={}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/resume.expected.md
index ca9d40e50..a66396b5e 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/resume.expected.md
@@ -12,7 +12,7 @@
     <!--M*2 #text/0-->
      
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{"#scope":1},"#childScope/1":{"#scope":2},"#scope":0}}),[])
+      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{},"#childScope/1":{}}}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/ssr.expected.md
index 1a9135efd..8049668f5 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!>3<!M*1 #text/0> <!>y<!M*2 #text/0> <script>(M$h=[]).push(_=>(_.a={0:{"#childScope/0":{"#scope":1},"#childScope/1":{"#scope":2},"#scope":0}}),[])</script>
+  <!>3<!M*1 #text/0> <!>y<!M*2 #text/0> <script>(M$h=[]).push(_=>(_.a={0:{"#childScope/0":{},"#childScope/1":{}}}),[])</script>
 
 
 # Render "End"
@@ -16,7 +16,7 @@
     <!--M*2 #text/0-->
      
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{"#scope":1},"#childScope/1":{"#scope":2},"#scope":0}}),[])
+      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{},"#childScope/1":{}}}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/template.js
index 8c10afc05..65885de33 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/template.js
@@ -1,13 +1,13 @@
-import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, peekNextScope as _peekNextScope, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, peekNextScope as _peekNextScope, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _customTag from "./components/custom-tag.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
   const _childScope = _peekNextScope();
   _customTag._({
-    renderBody: /* @__PURE__ */_createRenderer((count, count2) => {
+    renderBody: _register( /* @__PURE__ */_createRenderer((count, count2) => {
       const _scope1_id = _nextScopeId();
       _write(`<div>Counts: <!>${_escapeXML(count)}${_markResumeNode(_scope1_id, "#text/0")},<!>${_escapeXML(count2)}${_markResumeNode(_scope1_id, "#text/1")}</div>`);
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/template.marko_1_renderer")
   });
   _writeScope(_scope0_id, {
     "#childScope/0": _childScope
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
index 7a926dcf7..ea1356a0e 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button class=inc>1<!M*1 #text/1>,<!>10<!M*1 #text/2></button><!M*1 #button/0><!M[2><div>Counts: <!>1<!M*2 #text/0>,<!>10<!M*2 #text/1></div><!M]1 #text/3><script>(M$h=[]).push(_=>(_.c={0:{"#childScope/0":_.a={"#scope":1,x:1,y:10,"#text/3!":_.b={"#scope":2}},"#scope":0},1:_.a,2:_.b}),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/components/custom-tag.marko_0_x_y",])</script>
+  <button class=inc>1<!M*1 #text/1>,<!>10<!M*1 #text/2></button><!M*1 #button/0><!M[2><div>Counts: <!>1<!M*2 #text/0>,<!>10<!M*2 #text/1></div><!M]1 #text/3><script>(M$h=[]).push(_=>(_.c={0:{"#childScope/0":_.a={x:1,y:10,"#text/3!":_.b={},"#text/3(":_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/template.marko_1_renderer"]}},1:_.a,2:_.b}),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/components/custom-tag.marko_0_x_y",])</script>
 
 
 # Render "End"
@@ -31,7 +31,7 @@
     </div>
     <!--M]1 #text/3-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{"#childScope/0":_.a={"#scope":1,x:1,y:10,"#text/3!":_.b={"#scope":2}},"#scope":0},1:_.a,2:_.b}),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/components/custom-tag.marko_0_x_y",])
+      (M$h=[]).push(_=&gt;(_.c={0:{"#childScope/0":_.a={x:1,y:10,"#text/3!":_.b={},"#text/3(":_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/template.marko_1_renderer"]}},1:_.a,2:_.b}),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/components/custom-tag.marko_0_x_y",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/template.js
index 78b661b46..65acca8d9 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/template.js
@@ -1,17 +1,17 @@
-import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, peekNextScope as _peekNextScope, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, peekNextScope as _peekNextScope, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _customTag from "./components/custom-tag.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
   const _childScope = _peekNextScope();
   _customTag._({
     name: "hello",
-    renderBody: /* @__PURE__ */_createRenderer(({
+    renderBody: _register( /* @__PURE__ */_createRenderer(({
       count,
       name
     }) => {
       const _scope1_id = _nextScopeId();
       _write(`<div>Count (<!>${_escapeXML(name)}${_markResumeNode(_scope1_id, "#text/0")}): <!>${_escapeXML(count)}${_markResumeNode(_scope1_id, "#text/1")}</div>`);
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/template.marko_1_renderer")
   });
   _writeScope(_scope0_id, {
     "#childScope/0": _childScope
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md
index f372fd640..6d10234e9 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button class=inc>1<!M*1 #text/1></button><!M*1 #button/0><!M[2><div>Count (<!>hello<!M*2 #text/0>): <!>1<!M*2 #text/1></div><!M]1 #text/2><script>(M$h=[]).push(_=>(_.d={0:{"#childScope/0":_.b={"#scope":1,input:{name:"hello"}_.a=,x:1,"#text/2!":_.c={"#scope":2},"#text/2(":_.a},"#scope":0},1:_.b,2:_.c}),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/components/custom-tag.marko_0_x",])</script>
+  <button class=inc>1<!M*1 #text/1></button><!M*1 #button/0><!M[2><div>Count (<!>hello<!M*2 #text/0>): <!>1<!M*2 #text/1></div><!M]1 #text/2><script>(M$h=[]).push(_=>(_.c={0:{"#childScope/0":_.a={input:{name:"hello",renderBody:_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/template.marko_1_renderer"]},x:1,"#text/2!":_.b={},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/template.marko_1_renderer"]}},1:_.a,2:_.b}),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/components/custom-tag.marko_0_x",])</script>
 
 
 # Render "End"
@@ -27,7 +27,7 @@
     </div>
     <!--M]1 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:{"#childScope/0":_.b={"#scope":1,input:{name:"hello"}_.a=,x:1,"#text/2!":_.c={"#scope":2},"#text/2(":_.a},"#scope":0},1:_.b,2:_.c}),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/components/custom-tag.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.c={0:{"#childScope/0":_.a={input:{name:"hello",renderBody:_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/template.marko_1_renderer"]},x:1,"#text/2!":_.b={},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/template.marko_1_renderer"]}},1:_.a,2:_.b}),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/components/custom-tag.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/template.js
index 6abfcffa7..e894c56c4 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/template.js
@@ -1,13 +1,13 @@
-import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, peekNextScope as _peekNextScope, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, peekNextScope as _peekNextScope, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _customTag from "./components/custom-tag.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
   const _childScope = _peekNextScope();
   _customTag._({
-    renderBody: /* @__PURE__ */_createRenderer(count => {
+    renderBody: _register( /* @__PURE__ */_createRenderer(count => {
       const _scope1_id = _nextScopeId();
       _write(`<div>Count: <!>${_escapeXML(count)}${_markResumeNode(_scope1_id, "#text/0")}</div>`);
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/template.marko_1_renderer")
   });
   _writeScope(_scope0_id, {
     "#childScope/0": _childScope
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md
index 760043951..0899b4154 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button class=inc>1<!M*1 #text/1></button><!M*1 #button/0><!M[2><div>Count: <!>1<!M*2 #text/0></div><!M]1 #text/2><script>(M$h=[]).push(_=>(_.c={0:{"#childScope/0":_.a={"#scope":1,x:1,"#text/2!":_.b={"#scope":2}},"#scope":0},1:_.a,2:_.b}),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/components/custom-tag.marko_0_x",])</script>
+  <button class=inc>1<!M*1 #text/1></button><!M*1 #button/0><!M[2><div>Count: <!>1<!M*2 #text/0></div><!M]1 #text/2><script>(M$h=[]).push(_=>(_.c={0:{"#childScope/0":_.a={x:1,"#text/2!":_.b={},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/template.marko_1_renderer"]}},1:_.a,2:_.b}),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/components/custom-tag.marko_0_x",])</script>
 
 
 # Render "End"
@@ -23,7 +23,7 @@
     </div>
     <!--M]1 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{"#childScope/0":_.a={"#scope":1,x:1,"#text/2!":_.b={"#scope":2}},"#scope":0},1:_.a,2:_.b}),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/components/custom-tag.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.c={0:{"#childScope/0":_.a={x:1,"#text/2!":_.b={},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/template.marko_1_renderer"]}},1:_.a,2:_.b}),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/components/custom-tag.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/template.js
index 76f725800..f0d57130e 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/template.js
@@ -1,14 +1,14 @@
-import { write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, peekNextScope as _peekNextScope, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, peekNextScope as _peekNextScope, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _child from "./components/child/index.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
   const _childScope = _peekNextScope();
   _child._({
     name: "World",
-    renderBody: /* @__PURE__ */_createRenderer(() => {
+    renderBody: _register( /* @__PURE__ */_createRenderer(() => {
       const _scope1_id = _nextScopeId();
       _write("This is the body content");
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/template.marko_1_renderer")
   });
   _writeScope(_scope0_id, {
     "#childScope/0": _childScope
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/resume.expected.md
index 26ed0eeef..da5d5fd21 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/resume.expected.md
@@ -7,7 +7,7 @@
     This is the body content
     <!--M]1 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{"#childScope/0":_.a={"#scope":1,"#text/0!":_.b={"#scope":2}},"#scope":0},1:_.a,2:_.b}),[])
+      (M$h=[]).push(_=&gt;(_.c={0:{"#childScope/0":_.a={"#text/0!":_.b={},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/template.marko_1_renderer"]}},1:_.a,2:_.b}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/ssr.expected.md
index ca37b3dc6..8097f2a6c 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[2>This is the body content<!M]1 #text/0><script>(M$h=[]).push(_=>(_.c={0:{"#childScope/0":_.a={"#scope":1,"#text/0!":_.b={"#scope":2}},"#scope":0},1:_.a,2:_.b}),[])</script>
+  <!M[2>This is the body content<!M]1 #text/0><script>(M$h=[]).push(_=>(_.c={0:{"#childScope/0":_.a={"#text/0!":_.b={},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/template.marko_1_renderer"]}},1:_.a,2:_.b}),[])</script>
 
 
 # Render "End"
@@ -11,7 +11,7 @@
     This is the body content
     <!--M]1 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{"#childScope/0":_.a={"#scope":1,"#text/0!":_.b={"#scope":2}},"#scope":0},1:_.a,2:_.b}),[])
+      (M$h=[]).push(_=&gt;(_.c={0:{"#childScope/0":_.a={"#text/0!":_.b={},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-render-body/template.marko_1_renderer"]}},1:_.a,2:_.b}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/resume.expected.md
index 51b299138..cb5fade03 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
     <!--M*1 #text/0-->
     !
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{"#scope":1},"#scope":0}}),[])
+      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{}}}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/ssr.expected.md
index d358607c6..1465fa076 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  Hello <!>Frank<!M*1 #text/0>!<script>(M$h=[]).push(_=>(_.a={0:{"#childScope/0":{"#scope":1},"#scope":0}}),[])</script>
+  Hello <!>Frank<!M*1 #text/0>!<script>(M$h=[]).push(_=>(_.a={0:{"#childScope/0":{}}}),[])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     <!--M*1 #text/0-->
     !
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{"#scope":1},"#scope":0}}),[])
+      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{}}}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/resume.expected.md
index 4d2beb64a..92c510d98 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/template.marko_0_data"](_.a),_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#childScope/0":_.b={}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/template.marko_0_data"](_.a),_.c),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/ssr.expected.md
index 7519194e0..7fbe43c4a 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <span>child</span><div>4<!M*0 #text/1></div><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/template.marko_0_data"](_.a),_.c),[])</script>
+  <span>child</span><div>4<!M*0 #text/1></div><script>(M$h=[]).push(_=>(_.c={0:_.a={"#childScope/0":_.b={}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/template.marko_0_data"](_.a),_.c),[])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/template.marko_0_data"](_.a),_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#childScope/0":_.b={}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var-expression/template.marko_0_data"](_.a),_.c),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/resume.expected.md
index 8a23a53b8..6f53896cf 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1,x:1,y:2}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/template.marko_0_data"](_.a),_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#childScope/0":_.b={x:1,y:2}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/template.marko_0_data"](_.a),_.c),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/ssr.expected.md
index 790ecb08d..545dcd545 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <span>child</span><div>3<!M*0 #text/1></div><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1,x:1,y:2}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/template.marko_0_data"](_.a),_.c),[])</script>
+  <span>child</span><div>3<!M*0 #text/1></div><script>(M$h=[]).push(_=>(_.c={0:_.a={"#childScope/0":_.b={x:1,y:2}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/template.marko_0_data"](_.a),_.c),[])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1,x:1,y:2}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/template.marko_0_data"](_.a),_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#childScope/0":_.b={x:1,y:2}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var-multiple/template.marko_0_data"](_.a),_.c),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/resume.expected.md
index 0c187606c..811375b12 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/resume.expected.md
@@ -15,7 +15,7 @@
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1,x:1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var/template.marko_0_data"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#childScope/0":_.b={x:1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var/template.marko_0_data"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko_0_x",])
     </script>
   </body>
 </html>
@@ -46,7 +46,7 @@ container.querySelector("button.inc").click()
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1,x:1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var/template.marko_0_data"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#childScope/0":_.b={x:1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var/template.marko_0_data"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko_0_x",])
     </script>
   </body>
 </html>
@@ -78,7 +78,7 @@ container.querySelector("button.inc").click()
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1,x:1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var/template.marko_0_data"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#childScope/0":_.b={x:1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var/template.marko_0_data"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko_0_x",])
     </script>
   </body>
 </html>
@@ -110,7 +110,7 @@ container.querySelector("button.inc").click()
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1,x:1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var/template.marko_0_data"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#childScope/0":_.b={x:1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var/template.marko_0_data"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/ssr.expected.md
index 6423d2c4e..8a81d9437 100644
--- a/packages/translator-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button class=inc>1<!M*1 #text/1></button><!M*1 #button/0><div>1<!M*0 #text/1></div><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1,x:1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var/template.marko_0_data"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko_0_x",])</script>
+  <button class=inc>1<!M*1 #text/1></button><!M*1 #button/0><div>1<!M*0 #text/1></div><script>(M$h=[]).push(_=>(_.c={0:_.a={"#childScope/0":_.b={x:1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var/template.marko_0_data"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko_0_x",])</script>
 
 
 # Render "End"
@@ -19,7 +19,7 @@
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1,x:1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var/template.marko_0_data"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#childScope/0":_.b={x:1}},1:_.b},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/custom-tag-var/template.marko_0_data"](_.a),_.c),[1,"packages/translator-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/template.js
index a8805b887..9f29f3a1b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/template.js
@@ -1,14 +1,14 @@
-import { write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, peekNextScope as _peekNextScope, markResumeNode as _markResumeNode, writeEffect as _writeEffect, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, peekNextScope as _peekNextScope, markResumeNode as _markResumeNode, writeEffect as _writeEffect, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _child from "./components/child.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
   const selected = false;
   const myThing = {
     selected: selected,
-    renderBody: /* @__PURE__ */_createRenderer(() => {
+    renderBody: _register( /* @__PURE__ */_createRenderer(() => {
       const _scope1_id = _nextScopeId();
       _write("<span>The thing</span>");
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/template.marko_1_renderer")
   };
   const _childScope = _peekNextScope();
   _child._({
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/ssr.expected.md
index 0bd0f27c6..38815332f 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><!M[2><span>The thing</span><!M]1 #text/1></div><!M*1 #div/0><button>Toggle</button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.c={0:{selected:!1,"#childScope/0":_.a={"#scope":1,"#text/1!":_.b={"#scope":2}},"#scope":0},1:_.a,2:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/template.marko_0_selected",])</script>
+  <div><!M[2><span>The thing</span><!M]1 #text/1></div><!M*1 #div/0><button>Toggle</button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.c={0:{selected:!1,"#childScope/0":_.a={"#text/1!":_.b={},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/template.marko_1_renderer"]}},1:_.a,2:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/template.marko_0_selected",])</script>
 
 
 # Render "End"
@@ -20,7 +20,7 @@
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{selected:!1,"#childScope/0":_.a={"#scope":1,"#text/1!":_.b={"#scope":2}},"#scope":0},1:_.a,2:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/template.marko_0_selected",])
+      (M$h=[]).push(_=&gt;(_.c={0:{selected:!1,"#childScope/0":_.a={"#text/1!":_.b={},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/template.marko_1_renderer"]}},1:_.a,2:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/template.marko_0_selected",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/resume.expected.md
index 9d9387d33..459256c9a 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/resume.expected.md
@@ -13,7 +13,7 @@
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-object/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-object/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -42,7 +42,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-object/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-object/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -72,7 +72,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-object/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-object/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -102,7 +102,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-object/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-object/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/ssr.expected.md
index c0f9cd1c2..b1879b0c1 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div>{"foo":1,"bar":2}<!M*0 #text/0></div><button>1<!M*0 #text/2></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-object/template.marko_0_x",])</script>
+  <div>{"foo":1,"bar":2}<!M*0 #text/0></div><button>1<!M*0 #text/2></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-object/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -17,7 +17,7 @@
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-object/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-object/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/html.expected/template.js
index 35ce71157..caa6234e7 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/html.expected/template.js
@@ -1,12 +1,12 @@
-import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, dynamicTagArgs as _dynamicTagArgs, markResumeControlEnd as _markResumeControlEnd, writeEffect as _writeEffect, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, dynamicTagArgs as _dynamicTagArgs, markResumeControlEnd as _markResumeControlEnd, writeEffect as _writeEffect, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
   const x = 1;
   const myTag = {
-    renderBody: /* @__PURE__ */_createRenderer((a, b, c) => {
+    renderBody: _register( /* @__PURE__ */_createRenderer((a, b, c) => {
       const _scope1_id = _nextScopeId();
       _write(`<div>${_escapeXML(a)}${_markResumeNode(_scope1_id, "#text/0")}|<!>${_escapeXML(b)}${_markResumeNode(_scope1_id, "#text/1")}|<!>${_escapeXML(c)}${_markResumeNode(_scope1_id, "#text/2")}</div>`);
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/template.marko_1_renderer")
   };
   const _dynamicScope = _dynamicTagArgs(myTag, [1, "Hello", x]);
   _write(`${_markResumeControlEnd(_scope0_id, "#text/0")}<button>${_escapeXML(x)}${_markResumeNode(_scope0_id, "#text/2")}</button>${_markResumeNode(_scope0_id, "#button/1")}`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/ssr.expected.md
index 9896ffba5..71d8f366a 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[1><div>1<!M*1 #text/0>|<!>Hello<!M*1 #text/1>|<!>1<!M*1 #text/2></div><!M]0 #text/0><button>1<!M*0 #text/2></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.b={0:{x:1,"#text/0!":_.a={"#scope":1},"#text/0(":{},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/template.marko_0_x",])</script>
+  <!M[1><div>1<!M*1 #text/0>|<!>Hello<!M*1 #text/1>|<!>1<!M*1 #text/2></div><!M]0 #text/0><button>1<!M*0 #text/2></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.b={0:{x:1,"#text/0!":_.a={},"#text/0(":{renderBody:_._["packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/template.marko_1_renderer"]}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -27,7 +27,7 @@
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{x:1,"#text/0!":_.a={"#scope":1},"#text/0(":{},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.b={0:{x:1,"#text/0!":_.a={},"#text/0(":{renderBody:_._["packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/template.marko_1_renderer"]}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/html.expected/template.js
index 19f82f072..43af8b880 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/html.expected/template.js
@@ -1,14 +1,14 @@
-import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, dynamicTagInput as _dynamicTagInput, markResumeControlEnd as _markResumeControlEnd, writeEffect as _writeEffect, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, dynamicTagInput as _dynamicTagInput, markResumeControlEnd as _markResumeControlEnd, writeEffect as _writeEffect, writeScope as _writeScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
   const x = 1;
   const myTag = {
-    renderBody: /* @__PURE__ */_createRenderer(({
+    renderBody: _register( /* @__PURE__ */_createRenderer(({
       number
     }) => {
       const _scope1_id = _nextScopeId();
       _write(`<div>${_escapeXML(number)}${_markResumeNode(_scope1_id, "#text/0")}</div>`);
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/template.marko_1_renderer")
   };
   const _dynamicScope = _dynamicTagInput(myTag, {
     number: x
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/ssr.expected.md
index 5dad44a79..106626b7e 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[1><div>1<!M*1 #text/0></div><!M]0 #text/0><button>1<!M*0 #text/2></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.b={0:{x:1,"#text/0!":_.a={"#scope":1},"#text/0(":{},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/template.marko_0_x",])</script>
+  <!M[1><div>1<!M*1 #text/0></div><!M]0 #text/0><button>1<!M*0 #text/2></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.b={0:{x:1,"#text/0!":_.a={},"#text/0(":{renderBody:_._["packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/template.marko_1_renderer"]}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -19,7 +19,7 @@
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{x:1,"#text/0!":_.a={"#scope":1},"#text/0(":{},"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.b={0:{x:1,"#text/0!":_.a={},"#text/0(":{renderBody:_._["packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/template.marko_1_renderer"]}},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/dom.expected/template.js
index 6430e6410..d0c4b4c58 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
-import { data as _data, bindRenderer as _bindRenderer, on as _on, queueSource as _queueSource, createRenderer as _createRenderer, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, register as _register, conditional as _conditional, queueEffect as _queueEffect, dynamicSubscribers as _dynamicSubscribers, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { data as _data, bindRenderer as _bindRenderer, on as _on, queueSource as _queueSource, createRenderer as _createRenderer, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, registerRenderer as _registerRenderer, conditional as _conditional, register as _register, queueEffect as _queueEffect, dynamicSubscribers as _dynamicSubscribers, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 const _x$defineBody = _registerSubscriber("packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_1_x/subscriber", /* @__PURE__ */_dynamicClosure("x", (_scope, x) => _data(_scope["#text/0"], x)));
-const _defineBody = _register("packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<div> </div>", /* next(1), get */"D ", void 0, [_x$defineBody]));
+const _defineBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<div> </div>", /* next(1), get */"D ", void 0, [_x$defineBody]));
 const _dynamicTagName = /* @__PURE__ */_conditional("#text/0");
 const _onClick = _scope => {
   const {
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/html.expected/template.js
index 969ff0b7c..c061a6893 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/html.expected/template.js
@@ -1,16 +1,16 @@
-import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, dynamicTagInput as _dynamicTagInput, markResumeControlEnd as _markResumeControlEnd, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, dynamicTagInput as _dynamicTagInput, markResumeControlEnd as _markResumeControlEnd, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
   const x = 1;
   const myTag = {
-    renderBody: /* @__PURE__ */_createRenderer(() => {
+    renderBody: _register( /* @__PURE__ */_createRenderer(() => {
       const _scope1_id = _nextScopeId();
       _write(`<div>${_escapeXML(x)}${_markResumeNode(_scope1_id, "#text/0")}</div>`);
       _writeEffect(_scope1_id, "packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_1_x/subscriber");
       _writeScope(_scope1_id, {
         "_": _ensureScopeWithId(_scope0_id)
       });
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_1_renderer", _scope0_id)
   };
   const _dynamicScope = _dynamicTagInput(myTag, {});
   _write(`${_markResumeControlEnd(_scope0_id, "#text/0")}<button>${_escapeXML(x)}${_markResumeNode(_scope0_id, "#text/2")}</button>${_markResumeNode(_scope0_id, "#button/1")}`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/ssr.expected.md
index ed82b9a64..fd4133f67 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[1><div>1<!M*1 #text/0></div><!M]0 #text/0><button>1<!M*0 #text/2></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,x:1,"#text/0!":_.b={"#scope":1},"#text/0(":{}},1:_.b},_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_1_x/subscriber",0,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_0_x",])</script>
+  <!M[1><div>1<!M*1 #text/0></div><!M]0 #text/0><button>1<!M*0 #text/2></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.d={0:_.a={x:1,"#text/0!":_.b={},"#text/0(":_.c={}},1:_.b},_.b._=_.a,_.c.renderBody=_._["packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_1_renderer"](_.a),_.d),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_1_x/subscriber",0,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -19,7 +19,7 @@
     </button>
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,x:1,"#text/0!":_.b={"#scope":1},"#text/0(":{}},1:_.b},_.b._=_.a,_.c),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_1_x/subscriber",0,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={x:1,"#text/0!":_.b={},"#text/0(":_.c={}},1:_.b},_.b._=_.a,_.c.renderBody=_._["packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_1_renderer"](_.a),_.d),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_1_x/subscriber",0,"packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/html.expected/template.js
index 815d4665a..0e8480d36 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/html.expected/template.js
@@ -1,8 +1,8 @@
-import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, dynamicTagInput as _dynamicTagInput, markResumeControlEnd as _markResumeControlEnd, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, dynamicTagInput as _dynamicTagInput, markResumeControlEnd as _markResumeControlEnd, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
   const myTag = {
-    renderBody: /* @__PURE__ */_createRenderer(({
+    renderBody: _register( /* @__PURE__ */_createRenderer(({
       name
     }) => {
       const _scope1_id = _nextScopeId();
@@ -12,7 +12,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
       _writeScope(_scope1_id, {
         "y": y
       });
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_renderer")
   };
   const _dynamicScope = _dynamicTagInput(myTag, {
     name: "Ryan"
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/resume.expected.md
index 36c58aa88..067b96120 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/resume.expected.md
@@ -21,7 +21,7 @@
     <!--M*1 #button/2-->
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={"#scope":1,y:1},"#text/0(":{},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_y",])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={y:1},"#text/0(":{renderBody:_._["packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_renderer"]}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_y",])
     </script>
   </body>
 </html>
@@ -59,7 +59,7 @@ container.querySelector("button").click()
     <!--M*1 #button/2-->
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={"#scope":1,y:1},"#text/0(":{},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_y",])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={y:1},"#text/0(":{renderBody:_._["packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_renderer"]}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_y",])
     </script>
   </body>
 </html>
@@ -97,7 +97,7 @@ container.querySelector("button").click()
     <!--M*1 #button/2-->
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={"#scope":1,y:1},"#text/0(":{},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_y",])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={y:1},"#text/0(":{renderBody:_._["packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_renderer"]}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_y",])
     </script>
   </body>
 </html>
@@ -135,7 +135,7 @@ container.querySelector("button").click()
     <!--M*1 #button/2-->
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={"#scope":1,y:1},"#text/0(":{},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_y",])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={y:1},"#text/0(":{renderBody:_._["packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_renderer"]}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_y",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/ssr.expected.md
index 32739544e..643ff2ac1 100644
--- a/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[1><div>Hello <!>Ryan<!M*1 #text/0> <!>1<!M*1 #text/1></div><button>1<!M*1 #text/3></button><!M*1 #button/2><!M]0 #text/0><script>(M$h=[]).push(_=>(_.b={0:{"#text/0!":_.a={"#scope":1,y:1},"#text/0(":{},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_y",])</script>
+  <!M[1><div>Hello <!>Ryan<!M*1 #text/0> <!>1<!M*1 #text/1></div><button>1<!M*1 #text/3></button><!M*1 #button/2><!M]0 #text/0><script>(M$h=[]).push(_=>(_.b={0:{"#text/0!":_.a={y:1},"#text/0(":{renderBody:_._["packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_renderer"]}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_y",])</script>
 
 
 # Render "End"
@@ -25,7 +25,7 @@
     <!--M*1 #button/2-->
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={"#scope":1,y:1},"#text/0(":{},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_y",])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={y:1},"#text/0(":{renderBody:_._["packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_renderer"]}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_y",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/resume.expected.md
index 95aef0ca3..3b690aab8 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
       <!--M*0 #button/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{show:!1,"#scope":0},$global:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/dollar-global-client/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.a={0:{show:!1},$global:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/dollar-global-client/template.marko_0_show",])
     </script>
   </body>
 </html>
@@ -40,7 +40,7 @@ container.querySelector("button").click()
       <!--M*0 #button/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{show:!1,"#scope":0},$global:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/dollar-global-client/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.a={0:{show:!1},$global:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/dollar-global-client/template.marko_0_show",])
     </script>
   </body>
 </html>
@@ -68,7 +68,7 @@ container.querySelector("button").click()
       <!--M*0 #button/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{show:!1,"#scope":0},$global:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/dollar-global-client/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.a={0:{show:!1},$global:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/dollar-global-client/template.marko_0_show",])
     </script>
   </body>
 </html>
@@ -98,7 +98,7 @@ container.querySelector("button").click()
       <!--M*0 #button/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{show:!1,"#scope":0},$global:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/dollar-global-client/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.a={0:{show:!1},$global:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/dollar-global-client/template.marko_0_show",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/ssr.expected.md
index cf97befc8..286ec6fe2 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><!M|0 #text/0 ><button>Toggle</button><!M*0 #button/1></div><script>(M$h=[]).push(_=>(_.a={0:{show:!1,"#scope":0},$global:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/dollar-global-client/template.marko_0_show",])</script>
+  <div><!M|0 #text/0 ><button>Toggle</button><!M*0 #button/1></div><script>(M$h=[]).push(_=>(_.a={0:{show:!1},$global:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/dollar-global-client/template.marko_0_show",])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
       <!--M*0 #button/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{show:!1,"#scope":0},$global:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/dollar-global-client/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.a={0:{show:!1},$global:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/dollar-global-client/template.marko_0_show",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.js
index e7d6b6185..497037ef5 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.js
@@ -1,5 +1,5 @@
 const a = 1;
-import { on as _on, queueSource as _queueSource, data as _data, bindRenderer as _bindRenderer, inChild as _inChild, createRenderer as _createRenderer, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, conditional as _conditional, register as _register, dynamicSubscribers as _dynamicSubscribers, value as _value, queueEffect as _queueEffect, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { on as _on, queueSource as _queueSource, data as _data, bindRenderer as _bindRenderer, inChild as _inChild, createRenderer as _createRenderer, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, conditional as _conditional, registerRenderer as _registerRenderer, dynamicSubscribers as _dynamicSubscribers, value as _value, register as _register, queueEffect as _queueEffect, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 import { _setup_ as _customTag, _input_ as _customTag_input, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./components/custom-tag.marko";
 const _c$ifBody = _registerSubscriber("packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_3_c/subscriber", /* @__PURE__ */_dynamicClosure("c", (_scope, c) => _data(_scope["#text/2"], c), _scope => _scope._._));
 const _b$ifBody = /* @__PURE__ */_dynamicClosure("b", (_scope, b) => _data(_scope["#text/1"], b), _scope => _scope._._);
@@ -17,7 +17,7 @@ const _b$customTagBody = /* @__PURE__ */_dynamicClosure("b", (_scope, b) => _dat
 const _setup$customTagBody = _scope => {
   _data(_scope["#text/0"], a);
 };
-const _customTagBody = _register("packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<!> <!> <!>", /* replace, over(2), replace, over(2), replace */"%c%c%", _setup$customTagBody, [_b$customTagBody, _c$customTagBody]));
+const _customTagBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<!> <!> <!>", /* replace, over(2), replace, over(2), replace */"%c%c%", _setup$customTagBody, [_b$customTagBody, _c$customTagBody]));
 const _if = /* @__PURE__ */_conditional("#text/2");
 const _c = /* @__PURE__ */_value("c", null, _dynamicSubscribers("c"));
 const _b = /* @__PURE__ */_value("b", null, _dynamicSubscribers("b"));
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/template.js
index d129b4040..25a663b79 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 const a = 1;
-import { markResumeNode as _markResumeNode, write as _write, escapeXML as _escapeXML, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, peekNextScope as _peekNextScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
+import { markResumeNode as _markResumeNode, write as _write, escapeXML as _escapeXML, ensureScopeWithId as _ensureScopeWithId, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, peekNextScope as _peekNextScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
 import _customTag from "./components/custom-tag.marko";
 const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   const _scope0_id = _nextScopeId();
@@ -8,14 +8,14 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
   _write(`<button></button>${_markResumeNode(_scope0_id, "#button/0")}`);
   const _childScope = _peekNextScope();
   _customTag._({
-    renderBody: /* @__PURE__ */_createRenderer(() => {
+    renderBody: _register( /* @__PURE__ */_createRenderer(() => {
       const _scope1_id = _nextScopeId();
       _write(`${_escapeXML(a)} ${_escapeXML(b)} <!>${_escapeXML(c)}${_markResumeNode(_scope1_id, "#text/2")}`);
       _writeEffect(_scope1_id, "packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_c/subscriber");
       _writeScope(_scope1_id, {
         "_": _ensureScopeWithId(_scope0_id)
       });
-    })
+    }), "packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_renderer", _scope0_id)
   });
   _write("<div>");
   if (Math.random()) {
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/resume.expected.md
index 80ea44553..61a39f547 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/resume.expected.md
@@ -20,7 +20,7 @@
       <!--M*4 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:_.a={"#scope":0,b:2,c:3,"#childScope/1":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b,3:_.d={"#scope":3,_:_.a},4:{_:_.d,"#scope":4}},_.b._=_.a,_.e),[2,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_c/subscriber",4,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_3_c/subscriber",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_0",])
+      (M$h=[]).push(_=&gt;(_.e={0:_.a={b:2,c:3,"#childScope/1":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b,3:_.d={_:_.a},4:{_:_.d}},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_renderer"](_.a),_.e),[2,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_c/subscriber",4,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_3_c/subscriber",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_0",])
     </script>
   </body>
 </html>
@@ -56,7 +56,7 @@ container.querySelector("button").click()
       <!--M*4 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:_.a={"#scope":0,b:2,c:3,"#childScope/1":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b,3:_.d={"#scope":3,_:_.a},4:{_:_.d,"#scope":4}},_.b._=_.a,_.e),[2,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_c/subscriber",4,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_3_c/subscriber",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_0",])
+      (M$h=[]).push(_=&gt;(_.e={0:_.a={b:2,c:3,"#childScope/1":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b,3:_.d={_:_.a},4:{_:_.d}},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_renderer"](_.a),_.e),[2,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_c/subscriber",4,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_3_c/subscriber",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_0",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/ssr.expected.md
index 7687131b8..ab76b223b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button></button><!M*0 #button/0><div><!M[2>1 2 <!>3<!M*2 #text/2><!M]1 #text/0></div><div>1 2 <!>3<!M*4 #text/2></div><script>(M$h=[]).push(_=>(_.e={0:_.a={"#scope":0,b:2,c:3,"#childScope/1":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b,3:_.d={"#scope":3,_:_.a},4:{_:_.d,"#scope":4}},_.b._=_.a,_.e),[2,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_c/subscriber",4,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_3_c/subscriber",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_0",])</script>
+  <button></button><!M*0 #button/0><div><!M[2>1 2 <!>3<!M*2 #text/2><!M]1 #text/0></div><div>1 2 <!>3<!M*4 #text/2></div><script>(M$h=[]).push(_=>(_.e={0:_.a={b:2,c:3,"#childScope/1":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b,3:_.d={_:_.a},4:{_:_.d}},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_renderer"](_.a),_.e),[2,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_c/subscriber",4,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_3_c/subscriber",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_0",])</script>
 
 
 # Render "End"
@@ -24,7 +24,7 @@
       <!--M*4 #text/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:_.a={"#scope":0,b:2,c:3,"#childScope/1":_.c={"#scope":1,"#text/0!":_.b={"#scope":2}}},1:_.c,2:_.b,3:_.d={"#scope":3,_:_.a},4:{_:_.d,"#scope":4}},_.b._=_.a,_.e),[2,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_c/subscriber",4,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_3_c/subscriber",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_0",])
+      (M$h=[]).push(_=&gt;(_.e={0:_.a={b:2,c:3,"#childScope/1":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b,3:_.d={_:_.a},4:{_:_.d}},_.b._=_.a,_.c["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_renderer"](_.a),_.e),[2,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_1_c/subscriber",4,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_3_c/subscriber",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-closures/template.marko_0",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/resume.expected.md
index ed40e3e2d..419ce5f77 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -34,7 +34,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -59,7 +59,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -84,7 +84,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/ssr.expected.md
index 1df33bc76..1ce63676c 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>0<!M*0 #text/1></button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/template.marko_0_clickCount",])</script>
+  <button>0<!M*0 #text/1></button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/template.marko_0_clickCount",])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-event-handlers/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/resume.expected.md
index 8eacf66a3..0f3b440be 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/resume.expected.md
@@ -13,7 +13,7 @@
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{tagName:"span",className:"A","#text/0!":_.a={"#scope":1},"#text/0(":"span","#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.b={0:{tagName:"span",className:"A","#text/0!":_.a={},"#text/0(":"span"},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/template.marko_0_tagName",])
     </script>
   </body>
 </html>
@@ -42,7 +42,7 @@ container.querySelector("button").click()
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{tagName:"span",className:"A","#text/0!":_.a={"#scope":1},"#text/0(":"span","#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.b={0:{tagName:"span",className:"A","#text/0!":_.a={},"#text/0(":"span"},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/template.marko_0_tagName",])
     </script>
   </body>
 </html>
@@ -74,7 +74,7 @@ container.querySelector("button").click()
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{tagName:"span",className:"A","#text/0!":_.a={"#scope":1},"#text/0(":"span","#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.b={0:{tagName:"span",className:"A","#text/0!":_.a={},"#text/0(":"span"},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/template.marko_0_tagName",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/ssr.expected.md
index 63b029b85..02d64c6c1 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[1><span class=A>body content</span><!M]0 #text/0><button></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.b={0:{tagName:"span",className:"A","#text/0!":_.a={"#scope":1},"#text/0(":"span","#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/template.marko_0_tagName",])</script>
+  <!M[1><span class=A>body content</span><!M]0 #text/0><button></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.b={0:{tagName:"span",className:"A","#text/0!":_.a={},"#text/0(":"span"},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/template.marko_0_tagName",])</script>
 
 
 # Render "End"
@@ -17,7 +17,7 @@
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{tagName:"span",className:"A","#text/0!":_.a={"#scope":1},"#text/0(":"span","#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.b={0:{tagName:"span",className:"A","#text/0!":_.a={},"#text/0(":"span"},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/template.marko_0_tagName",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md
index 246ab9c24..773f2c1a2 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>Count: <!>1<!M*0 #text/1></button><!M*0 #button/0><!M[1><div>1<!M*1 #text/0></div><!M]0 #text/2><script>(M$h=[]).push(_=>(_.b={0:{x:1,"#text/2!":_.a={"#scope":1},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/components/custom-tag.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/template.marko_0_x",])</script>
+  <button>Count: <!>1<!M*0 #text/1></button><!M*0 #button/0><!M[1><div>1<!M*1 #text/0></div><!M]0 #text/2><script>(M$h=[]).push(_=>(_.b={0:{x:1,"#text/2!":_.a={},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/components/custom-tag.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -21,7 +21,7 @@
     </div>
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{x:1,"#text/2!":_.a={"#scope":1},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/components/custom-tag.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.b={0:{x:1,"#text/2!":_.a={},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/components/custom-tag.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-args/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/resume.expected.md
index d66eb964a..1ecff710a 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/resume.expected.md
@@ -12,7 +12,7 @@
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{className:"A","#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/template.marko_0_className",])
+      (M$h=[]).push(_=&gt;(_.a={0:{className:"A"}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/template.marko_0_className",])
     </script>
   </body>
 </html>
@@ -40,7 +40,7 @@ container.querySelector("button").click()
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{className:"A","#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/template.marko_0_className",])
+      (M$h=[]).push(_=&gt;(_.a={0:{className:"A"}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/template.marko_0_className",])
     </script>
   </body>
 </html>
@@ -68,7 +68,7 @@ container.querySelector("button").click()
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{className:"A","#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/template.marko_0_className",])
+      (M$h=[]).push(_=&gt;(_.a={0:{className:"A"}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/template.marko_0_className",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/ssr.expected.md
index d5f4a1995..44b7ee0fd 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <p class=A>paragraph</p><!M*0 #p/0><button></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.a={0:{className:"A","#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/template.marko_0_className",])</script>
+  <p class=A>paragraph</p><!M*0 #p/0><button></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.a={0:{className:"A"}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/template.marko_0_className",])</script>
 
 
 # Render "End"
@@ -16,7 +16,7 @@
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{className:"A","#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/template.marko_0_className",])
+      (M$h=[]).push(_=&gt;(_.a={0:{className:"A"}}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/template.marko_0_className",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md
index b2dab8fcd..b8b82c8de 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md
@@ -14,7 +14,7 @@
     </div>
     <!--M]0 #text/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#text/1!":_.a={"#scope":1},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#text/1!":_.a={},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/template.marko_0_tagName",])
     </script>
   </body>
 </html>
@@ -40,7 +40,7 @@ container.querySelector("button").click()
     />
     <!--M]0 #text/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#text/1!":_.a={"#scope":1},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#text/1!":_.a={},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/template.marko_0_tagName",])
     </script>
   </body>
 </html>
@@ -69,7 +69,7 @@ container.querySelector("button").click()
     </div>
     <!--M]0 #text/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#text/1!":_.a={"#scope":1},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#text/1!":_.a={},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/template.marko_0_tagName",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md
index 309261e03..160f6e8a0 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button></button><!M*0 #button/0><!M[1><div>Id is <!>dynamic<!M*1 #text/0></div><!M]0 #text/1><script>(M$h=[]).push(_=>(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#text/1!":_.a={"#scope":1},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/template.marko_0_tagName",])</script>
+  <button></button><!M*0 #button/0><!M[1><div>Id is <!>dynamic<!M*1 #text/0></div><!M]0 #text/1><script>(M$h=[]).push(_=>(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#text/1!":_.a={},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/template.marko_0_tagName",])</script>
 
 
 # Render "End"
@@ -18,7 +18,7 @@
     </div>
     <!--M]0 #text/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#text/1!":_.a={"#scope":1},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"],"#text/1!":_.a={},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-native/template.marko_0_tagName",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md
index f2f95590c..79b767d50 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md
@@ -14,7 +14,7 @@
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],val:3,"#text/0!":_.a={"#scope":1},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/template.marko_0_tagName",])
     </script>
   </body>
 </html>
@@ -41,7 +41,7 @@ container.querySelector("button").click()
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],val:3,"#text/0!":_.a={"#scope":1},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/template.marko_0_tagName",])
     </script>
   </body>
 </html>
@@ -70,7 +70,7 @@ container.querySelector("button").click()
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],val:3,"#text/0!":_.a={"#scope":1},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/template.marko_0_tagName",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/ssr.expected.md
index 4d45df429..f40c36145 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[1><div>Child 1 has <!>3<!M*1 #text/0></div><!M]0 #text/0><button></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],val:3,"#text/0!":_.a={"#scope":1},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/template.marko_0_tagName",])</script>
+  <!M[1><div>Child 1 has <!>3<!M*1 #text/0></div><!M]0 #text/0><button></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/template.marko_0_tagName",])</script>
 
 
 # Render "End"
@@ -18,7 +18,7 @@
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],val:3,"#text/0!":_.a={"#scope":1},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.b={0:{tagName:_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/components/child1.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/template.marko_0_tagName",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md
index b9ee66635..781d8e905 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>Count: <!>1<!M*0 #text/1></button><!M*0 #button/0><!M[1><div>1<!M*1 #text/0></div><!M]0 #text/2><script>(M$h=[]).push(_=>(_.b={0:{x:1,"#text/2!":_.a={"#scope":1},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/components/custom-tag.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/template.marko_0_x",])</script>
+  <button>Count: <!>1<!M*0 #text/1></button><!M*0 #button/0><!M[1><div>1<!M*1 #text/0></div><!M]0 #text/2><script>(M$h=[]).push(_=>(_.b={0:{x:1,"#text/2!":_.a={},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/components/custom-tag.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -21,7 +21,7 @@
     </div>
     <!--M]0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{x:1,"#text/2!":_.a={"#scope":1},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/components/custom-tag.marko"],"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.b={0:{x:1,"#text/2!":_.a={},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/components/custom-tag.marko"]},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-single-arg/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/resume.expected.md
index 7bafe94f9..31a8cb371 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{x:null,"#text/0!":_.a={"#scope":1},"#text/0(":null,"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.b={0:{x:null,"#text/0!":_.a={},"#text/0(":null},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -36,7 +36,7 @@ container.querySelector("button").click()
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{x:null,"#text/0!":_.a={"#scope":1},"#text/0(":null,"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.b={0:{x:null,"#text/0!":_.a={},"#text/0(":null},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -63,7 +63,7 @@ container.querySelector("button").click()
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{x:null,"#text/0!":_.a={"#scope":1},"#text/0(":null,"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.b={0:{x:null,"#text/0!":_.a={},"#text/0(":null},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/ssr.expected.md
index b9eb2dfd6..345df290d 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[1>Body Content<!M]0 #text/0><button></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.b={0:{x:null,"#text/0!":_.a={"#scope":1},"#text/0(":null,"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/template.marko_0_x",])</script>
+  <!M[1>Body Content<!M]0 #text/0><button></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.b={0:{x:null,"#text/0!":_.a={},"#text/0(":null},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     <button />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{x:null,"#text/0!":_.a={"#scope":1},"#text/0(":null,"#scope":0},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.b={0:{x:null,"#text/0!":_.a={},"#text/0(":null},1:_.a}),[0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/resume.expected.md
index 03e5e5c40..1e958bf30 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/resume.expected.md
@@ -19,7 +19,7 @@
     />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{tagName:"div","#text/0!":_.a={"#scope":1},"#text/0(":"div","#scope":0},1:_.a,2:{"#childScope/0":_.b={"#scope":3,count:0},"#scope":2},3:_.b}),[3,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.c={0:{tagName:"div","#text/0!":_.a={},"#text/0(":"div"},1:_.a,2:{"#childScope/0":_.b={count:0}},3:_.b}),[3,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/template.marko_0_tagName",])
     </script>
   </body>
 </html>
@@ -55,7 +55,7 @@ container.querySelector("#count").click()
     />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{tagName:"div","#text/0!":_.a={"#scope":1},"#text/0(":"div","#scope":0},1:_.a,2:{"#childScope/0":_.b={"#scope":3,count:0},"#scope":2},3:_.b}),[3,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.c={0:{tagName:"div","#text/0!":_.a={},"#text/0(":"div"},1:_.a,2:{"#childScope/0":_.b={count:0}},3:_.b}),[3,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/template.marko_0_tagName",])
     </script>
   </body>
 </html>
@@ -87,7 +87,7 @@ container.querySelector("#changeTag").click()
     />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{tagName:"div","#text/0!":_.a={"#scope":1},"#text/0(":"div","#scope":0},1:_.a,2:{"#childScope/0":_.b={"#scope":3,count:0},"#scope":2},3:_.b}),[3,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.c={0:{tagName:"div","#text/0!":_.a={},"#text/0(":"div"},1:_.a,2:{"#childScope/0":_.b={count:0}},3:_.b}),[3,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/template.marko_0_tagName",])
     </script>
   </body>
 </html>
@@ -122,7 +122,7 @@ container.querySelector("#count").click()
     />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{tagName:"div","#text/0!":_.a={"#scope":1},"#text/0(":"div","#scope":0},1:_.a,2:{"#childScope/0":_.b={"#scope":3,count:0},"#scope":2},3:_.b}),[3,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.c={0:{tagName:"div","#text/0!":_.a={},"#text/0(":"div"},1:_.a,2:{"#childScope/0":_.b={count:0}},3:_.b}),[3,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/template.marko_0_tagName",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/ssr.expected.md
index d7f98a007..708b98813 100644
--- a/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[1><div><button id=count>0<!M*3 #text/1></button><!M*3 #button/0></div><!M]0 #text/0><button id=changeTag></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.c={0:{tagName:"div","#text/0!":_.a={"#scope":1},"#text/0(":"div","#scope":0},1:_.a,2:{"#childScope/0":_.b={"#scope":3,count:0},"#scope":2},3:_.b}),[3,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/template.marko_0_tagName",])</script>
+  <!M[1><div><button id=count>0<!M*3 #text/1></button><!M*3 #button/0></div><!M]0 #text/0><button id=changeTag></button><!M*0 #button/1><script>(M$h=[]).push(_=>(_.c={0:{tagName:"div","#text/0!":_.a={},"#text/0(":"div"},1:_.a,2:{"#childScope/0":_.b={count:0}},3:_.b}),[3,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/template.marko_0_tagName",])</script>
 
 
 # Render "End"
@@ -23,7 +23,7 @@
     />
     <!--M*0 #button/1-->
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{tagName:"div","#text/0!":_.a={"#scope":1},"#text/0(":"div","#scope":0},1:_.a,2:{"#childScope/0":_.b={"#scope":3,count:0},"#scope":2},3:_.b}),[3,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/template.marko_0_tagName",])
+      (M$h=[]).push(_=&gt;(_.c={0:{tagName:"div","#text/0!":_.a={},"#text/0(":"div"},1:_.a,2:{"#childScope/0":_.b={count:0}},3:_.b}),[3,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko_0_count",0,"packages/translator-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/template.marko_0_tagName",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/effect-counter/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/effect-counter/__snapshots__/resume.expected.md
index bd68becf0..e1ae7271b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/effect-counter/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/effect-counter/__snapshots__/resume.expected.md
@@ -12,7 +12,7 @@
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-counter/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-counter/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -41,7 +41,7 @@ container.querySelector("button").click()
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-counter/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-counter/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -70,7 +70,7 @@ container.querySelector("button").click()
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-counter/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-counter/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -99,7 +99,7 @@ container.querySelector("button").click()
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-counter/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-counter/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/effect-counter/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/effect-counter/__snapshots__/ssr.expected.md
index 5d997c4a7..606ca82a4 100644
--- a/packages/translator-tags/src/__tests__/fixtures/effect-counter/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/effect-counter/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><button id=button>0</button><!M*0 #button/0></div><script>(M$h=[]).push(_=>(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-counter/template.marko_0_clickCount",])</script>
+  <div><button id=button>0</button><!M*0 #button/0></div><script>(M$h=[]).push(_=>(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-counter/template.marko_0_clickCount",])</script>
 
 
 # Render "End"
@@ -16,7 +16,7 @@
       <!--M*0 #button/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-counter/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-counter/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/effect-tag/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/effect-tag/__snapshots__/resume.expected.md
index d69644159..ad7b4a824 100644
--- a/packages/translator-tags/src/__tests__/fixtures/effect-tag/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/effect-tag/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
       1
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-tag/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-tag/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/effect-tag/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/effect-tag/__snapshots__/ssr.expected.md
index e3ee567eb..ec9419d49 100644
--- a/packages/translator-tags/src/__tests__/fixtures/effect-tag/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/effect-tag/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div id=ref>0</div><script>(M$h=[]).push(_=>(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-tag/template.marko_0_x",])</script>
+  <div id=ref>0</div><script>(M$h=[]).push(_=>(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-tag/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
       0
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-tag/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/effect-tag/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/for-destructure/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/for-destructure/__snapshots__/resume.expected.md
index 7eba88cd1..131bce978 100644
--- a/packages/translator-tags/src/__tests__/fixtures/for-destructure/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/for-destructure/__snapshots__/resume.expected.md
@@ -27,7 +27,7 @@
       <!--M*0 #button/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={"#scope":1}]]),"#scope":0},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])
+      (M$h=[]).push(_=&gt;(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={}]])},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])
     </script>
   </body>
 </html>
@@ -73,7 +73,7 @@ container.querySelector("#add").click()
       <!--M*0 #button/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={"#scope":1}]]),"#scope":0},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])
+      (M$h=[]).push(_=&gt;(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={}]])},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])
     </script>
   </body>
 </html>
@@ -116,7 +116,7 @@ container.querySelector("#remove").click()
       <!--M*0 #button/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={"#scope":1}]]),"#scope":0},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])
+      (M$h=[]).push(_=&gt;(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={}]])},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])
     </script>
   </body>
 </html>
@@ -151,7 +151,7 @@ container.querySelector("#remove").click()
       <!--M*0 #button/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={"#scope":1}]]),"#scope":0},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])
+      (M$h=[]).push(_=&gt;(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={}]])},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])
     </script>
   </body>
 </html>
@@ -190,7 +190,7 @@ container.querySelector("#add").click()
       <!--M*0 #button/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={"#scope":1}]]),"#scope":0},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])
+      (M$h=[]).push(_=&gt;(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={}]])},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/for-destructure/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/for-destructure/__snapshots__/ssr.expected.md
index 20bf8e189..f1ca0e0d4 100644
--- a/packages/translator-tags/src/__tests__/fixtures/for-destructure/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/for-destructure/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><div>Marko<!M*1 #text/0>: <!>HTML Reimagined<!M*1 #text/1></div><!M|0 #text/0 1><button id=add>Add</button><!M*0 #button/1><button id=remove>Remove</button><!M*0 #button/2></div><script>(M$h=[]).push(_=>(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={"#scope":1}]]),"#scope":0},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])</script>
+  <div><div>Marko<!M*1 #text/0>: <!>HTML Reimagined<!M*1 #text/1></div><!M|0 #text/0 1><button id=add>Add</button><!M*0 #button/1><button id=remove>Remove</button><!M*0 #button/2></div><script>(M$h=[]).push(_=>(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={}]])},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])</script>
 
 
 # Render "End"
@@ -31,7 +31,7 @@
       <!--M*0 #button/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={"#scope":1}]]),"#scope":0},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])
+      (M$h=[]).push(_=&gt;(_.c={0:{items:[{name:"Marko",description:"HTML Reimagined"}],"#text/0(":new Map(_.a=[[0,_.b={}]])},1:_.b}),[0,"packages/translator-tags/src/__tests__/fixtures/for-destructure/template.marko_0_items",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/resume.expected.md
index 542f6b99c..240713eae 100644
--- a/packages/translator-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/resume.expected.md
@@ -53,7 +53,7 @@
     </div>
     <!--M|0 #text/1 4,5,6-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{"#text/1(":new Map(_.a=[[0,_.b={"#scope":4}],[1,_.c={"#scope":5}],[2,_.d={"#scope":6}]]),"#scope":0},4:_.b,5:_.c,6:_.d}),[])
+      (M$h=[]).push(_=&gt;(_.e={0:{"#text/1(":new Map(_.a=[[0,_.b={}],[1,_.c={}],[2,_.d={}]])},4:_.b,5:_.c,6:_.d}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/ssr.expected.md
index 379225564..585d8136b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div>0<!M*1 #text/0>: <!>1<!M*1 #text/1></div><div>1<!M*2 #text/0>: <!>2<!M*2 #text/1></div><div>2<!M*3 #text/0>: <!>3<!M*3 #text/1></div><div>0<!M*4 #text/0>: <!>1<!M*4 #text/1></div><div>1<!M*5 #text/0>: <!>2<!M*5 #text/1></div><div>2<!M*6 #text/0>: <!>3<!M*6 #text/1></div><!M|0 #text/1 4,5,6><script>(M$h=[]).push(_=>(_.e={0:{"#text/1(":new Map(_.a=[[0,_.b={"#scope":4}],[1,_.c={"#scope":5}],[2,_.d={"#scope":6}]]),"#scope":0},4:_.b,5:_.c,6:_.d}),[])</script>
+  <div>0<!M*1 #text/0>: <!>1<!M*1 #text/1></div><div>1<!M*2 #text/0>: <!>2<!M*2 #text/1></div><div>2<!M*3 #text/0>: <!>3<!M*3 #text/1></div><div>0<!M*4 #text/0>: <!>1<!M*4 #text/1></div><div>1<!M*5 #text/0>: <!>2<!M*5 #text/1></div><div>2<!M*6 #text/0>: <!>3<!M*6 #text/1></div><!M|0 #text/1 4,5,6><script>(M$h=[]).push(_=>(_.e={0:{"#text/1(":new Map(_.a=[[0,_.b={}],[1,_.c={}],[2,_.d={}]])},4:_.b,5:_.c,6:_.d}),[])</script>
 
 
 # Render "End"
@@ -57,7 +57,7 @@
     </div>
     <!--M|0 #text/1 4,5,6-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{"#text/1(":new Map(_.a=[[0,_.b={"#scope":4}],[1,_.c={"#scope":5}],[2,_.d={"#scope":6}]]),"#scope":0},4:_.b,5:_.c,6:_.d}),[])
+      (M$h=[]).push(_=&gt;(_.e={0:{"#text/1(":new Map(_.a=[[0,_.b={}],[1,_.c={}],[2,_.d={}]])},4:_.b,5:_.c,6:_.d}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/resume.expected.md
index fe2ff912a..bb543ffbe 100644
--- a/packages/translator-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/resume.expected.md
@@ -13,7 +13,7 @@
       <!--M*0 #comment/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/html-comment-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/html-comment-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -42,7 +42,7 @@ container.querySelector("button").click()
       <!--M*0 #comment/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/html-comment-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/html-comment-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -72,7 +72,7 @@ container.querySelector("button").click()
       <!--M*0 #comment/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/html-comment-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/html-comment-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -102,7 +102,7 @@ container.querySelector("button").click()
       <!--M*0 #comment/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/html-comment-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/html-comment-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/ssr.expected.md
index c1760004f..22477e134 100644
--- a/packages/translator-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><button>0<!M*0 #text/1></button><!M*0 #button/0><!--0 + 0 = 0--><!M*0 #comment/2></div><script>(M$h=[]).push(_=>(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/html-comment-counter/template.marko_0_count",])</script>
+  <div><button>0<!M*0 #text/1></button><!M*0 #button/0><!--0 + 0 = 0--><!M*0 #comment/2></div><script>(M$h=[]).push(_=>(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/html-comment-counter/template.marko_0_count",])</script>
 
 
 # Render "End"
@@ -17,7 +17,7 @@
       <!--M*0 #comment/2-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/html-comment-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/html-comment-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/resume.expected.md
index 7fc62a7ea..8d4236019 100644
--- a/packages/translator-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/resume.expected.md
@@ -16,7 +16,7 @@
       <!--M*0 #text/3-->
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1},"#childScope/2":_.c={"#scope":2}},1:_.b,2:_.c},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_divName"](_.a),_.c["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_spanName"](_.a),_.d),[1,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",2,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#childScope/0":_.b={},"#childScope/2":_.c={}},1:_.b,2:_.c},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_divName"](_.a),_.c["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_spanName"](_.a),_.d),[1,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",2,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",])
     </script>
   </body>
 </html>
@@ -46,7 +46,7 @@
       <!--M*0 #text/3-->
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1},"#childScope/2":_.c={"#scope":2}},1:_.b,2:_.c},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_divName"](_.a),_.c["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_spanName"](_.a),_.d),[1,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",2,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#childScope/0":_.b={},"#childScope/2":_.c={}},1:_.b,2:_.c},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_divName"](_.a),_.c["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_spanName"](_.a),_.d),[1,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",2,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/ssr.expected.md
index 83efa47f3..989fb4541 100644
--- a/packages/translator-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><!--Body Text--><!M*1 #comment/0>&zwj;<!M*0 #text/1></div><span><!--Body Text--><!M*2 #comment/0>&zwj;<!M*0 #text/3></span><script>(M$h=[]).push(_=>(_.d={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1},"#childScope/2":_.c={"#scope":2}},1:_.b,2:_.c},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_divName"](_.a),_.c["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_spanName"](_.a),_.d),[1,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",2,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",])</script>
+  <div><!--Body Text--><!M*1 #comment/0>&zwj;<!M*0 #text/1></div><span><!--Body Text--><!M*2 #comment/0>&zwj;<!M*0 #text/3></span><script>(M$h=[]).push(_=>(_.d={0:_.a={"#childScope/0":_.b={},"#childScope/2":_.c={}},1:_.b,2:_.c},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_divName"](_.a),_.c["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_spanName"](_.a),_.d),[1,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",2,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",])</script>
 
 
 # Render "End"
@@ -20,7 +20,7 @@
       <!--M*0 #text/3-->
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,"#childScope/0":_.b={"#scope":1},"#childScope/2":_.c={"#scope":2}},1:_.b,2:_.c},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_divName"](_.a),_.c["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_spanName"](_.a),_.d),[1,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",2,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#childScope/0":_.b={},"#childScope/2":_.c={}},1:_.b,2:_.c},_.b["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_divName"](_.a),_.c["/"]=_._["packages/translator-tags/src/__tests__/fixtures/html-comment-var/template.marko_0_spanName"](_.a),_.d),[1,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",2,"packages/translator-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko_0",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/if-default-false/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/if-default-false/__snapshots__/resume.expected.md
index 5eaa640fc..1d9c1263b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/if-default-false/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/if-default-false/__snapshots__/resume.expected.md
@@ -7,7 +7,7 @@
     <!--M*0 #button/0-->
     <!--M|0 #text/1 -->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{show:!1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/if-default-false/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.a={0:{show:!1}}),[0,"packages/translator-tags/src/__tests__/fixtures/if-default-false/template.marko_0_show",])
     </script>
   </body>
 </html>
@@ -30,7 +30,7 @@ container.querySelector("button").click()
     <!--M*0 #button/0-->
     hi
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{show:!1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/if-default-false/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.a={0:{show:!1}}),[0,"packages/translator-tags/src/__tests__/fixtures/if-default-false/template.marko_0_show",])
     </script>
   </body>
 </html>
@@ -54,7 +54,7 @@ container.querySelector("button").click()
     <!--M*0 #button/0-->
     <!--M|0 #text/1 -->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{show:!1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/if-default-false/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.a={0:{show:!1}}),[0,"packages/translator-tags/src/__tests__/fixtures/if-default-false/template.marko_0_show",])
     </script>
   </body>
 </html>
@@ -78,7 +78,7 @@ container.querySelector("button").click()
     <!--M*0 #button/0-->
     hi
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{show:!1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/if-default-false/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.a={0:{show:!1}}),[0,"packages/translator-tags/src/__tests__/fixtures/if-default-false/template.marko_0_show",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/if-default-false/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/if-default-false/__snapshots__/ssr.expected.md
index e8152f113..51f3b9161 100644
--- a/packages/translator-tags/src/__tests__/fixtures/if-default-false/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/if-default-false/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button></button><!M*0 #button/0><!M|0 #text/1 ><script>(M$h=[]).push(_=>(_.a={0:{show:!1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/if-default-false/template.marko_0_show",])</script>
+  <button></button><!M*0 #button/0><!M|0 #text/1 ><script>(M$h=[]).push(_=>(_.a={0:{show:!1}}),[0,"packages/translator-tags/src/__tests__/fixtures/if-default-false/template.marko_0_show",])</script>
 
 
 # Render "End"
@@ -11,7 +11,7 @@
     <!--M*0 #button/0-->
     <!--M|0 #text/1 -->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{show:!1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/if-default-false/template.marko_0_show",])
+      (M$h=[]).push(_=&gt;(_.a={0:{show:!1}}),[0,"packages/translator-tags/src/__tests__/fixtures/if-default-false/template.marko_0_show",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/if-tag/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/if-tag/__snapshots__/resume.expected.md
index f1a52dca6..570721580 100644
--- a/packages/translator-tags/src/__tests__/fixtures/if-tag/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/if-tag/__snapshots__/resume.expected.md
@@ -12,7 +12,7 @@
       <!--M|0 #text/2 3-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:{"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_1_renderer"],"#text/0!":_.a={"#scope":1},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_2_renderer"],"#text/1!":_.b={"#scope":2},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_4_renderer"],"#text/2!":_.c={"#scope":3},"#scope":0},1:_.a,2:_.b,3:_.c}),[])
+      (M$h=[]).push(_=&gt;(_.d={0:{"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_1_renderer"],"#text/0!":_.a={},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_2_renderer"],"#text/1!":_.b={},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_4_renderer"],"#text/2!":_.c={}},1:_.a,2:_.b,3:_.c}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/if-tag/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/if-tag/__snapshots__/ssr.expected.md
index b3deaa640..298376cc2 100644
--- a/packages/translator-tags/src/__tests__/fixtures/if-tag/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/if-tag/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  Hello<!M|0 #text/0 1>World<!M|0 #text/1 2><div>B<!M|0 #text/2 3></div><script>(M$h=[]).push(_=>(_.d={0:{"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_1_renderer"],"#text/0!":_.a={"#scope":1},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_2_renderer"],"#text/1!":_.b={"#scope":2},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_4_renderer"],"#text/2!":_.c={"#scope":3},"#scope":0},1:_.a,2:_.b,3:_.c}),[])</script>
+  Hello<!M|0 #text/0 1>World<!M|0 #text/1 2><div>B<!M|0 #text/2 3></div><script>(M$h=[]).push(_=>(_.d={0:{"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_1_renderer"],"#text/0!":_.a={},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_2_renderer"],"#text/1!":_.b={},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_4_renderer"],"#text/2!":_.c={}},1:_.a,2:_.b,3:_.c}),[])</script>
 
 
 # Render "End"
@@ -16,7 +16,7 @@
       <!--M|0 #text/2 3-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:{"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_1_renderer"],"#text/0!":_.a={"#scope":1},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_2_renderer"],"#text/1!":_.b={"#scope":2},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_4_renderer"],"#text/2!":_.c={"#scope":3},"#scope":0},1:_.a,2:_.b,3:_.c}),[])
+      (M$h=[]).push(_=&gt;(_.d={0:{"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_1_renderer"],"#text/0!":_.a={},"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_2_renderer"],"#text/1!":_.b={},"#text/2(":_._["packages/translator-tags/src/__tests__/fixtures/if-tag/template.marko_4_renderer"],"#text/2!":_.c={}},1:_.a,2:_.b,3:_.c}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/resume.expected.md
index f8f6a10a6..63025db50 100644
--- a/packages/translator-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/resume.expected.md
@@ -6,7 +6,7 @@
     <div />
     <div />
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{"#scope":1},"#childScope/1":{"#scope":2},"#scope":0}}),[])
+      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{},"#childScope/1":{}}}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/ssr.expected.md
index 5f08ce75f..adf7aa872 100644
--- a/packages/translator-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div></div><div></div><script>(M$h=[]).push(_=>(_.a={0:{"#childScope/0":{"#scope":1},"#childScope/1":{"#scope":2},"#scope":0}}),[])</script>
+  <div></div><div></div><script>(M$h=[]).push(_=>(_.a={0:{"#childScope/0":{},"#childScope/1":{}}}),[])</script>
 
 
 # Render "End"
@@ -10,7 +10,7 @@
     <div />
     <div />
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{"#scope":1},"#childScope/1":{"#scope":2},"#scope":0}}),[])
+      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{},"#childScope/1":{}}}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/resume.expected.md
index efc27afd9..920840560 100644
--- a/packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
     </div>
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={"#scope":1},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/components/baz.marko"],"#scope":0},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/components/baz.marko"]},1:_.a}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/ssr.expected.md
index a98a1b208..fa674d8e0 100644
--- a/packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M[1><div>baz</div><!M]0 #text/0><script>(M$h=[]).push(_=>(_.b={0:{"#text/0!":_.a={"#scope":1},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/components/baz.marko"],"#scope":0},1:_.a}),[])</script>
+  <!M[1><div>baz</div><!M]0 #text/0><script>(M$h=[]).push(_=>(_.b={0:{"#text/0!":_.a={},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/components/baz.marko"]},1:_.a}),[])</script>
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     </div>
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={"#scope":1},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/components/baz.marko"],"#scope":0},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={},"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/import-tag-ternary/components/baz.marko"]},1:_.a}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/import-tag/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/import-tag/__snapshots__/resume.expected.md
index c35b7d7d5..c8866a04a 100644
--- a/packages/translator-tags/src/__tests__/fixtures/import-tag/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/import-tag/__snapshots__/resume.expected.md
@@ -8,7 +8,7 @@
     <div />
     b
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{"#scope":1},"#childScope/1":{"#scope":2},"#childScope/2":{"#scope":3},"#scope":0}}),[])
+      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{},"#childScope/1":{},"#childScope/2":{}}}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/import-tag/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/import-tag/__snapshots__/ssr.expected.md
index bed74343a..213af17cd 100644
--- a/packages/translator-tags/src/__tests__/fixtures/import-tag/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/import-tag/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div></div><div></div><div></div>b<script>(M$h=[]).push(_=>(_.a={0:{"#childScope/0":{"#scope":1},"#childScope/1":{"#scope":2},"#childScope/2":{"#scope":3},"#scope":0}}),[])</script>
+  <div></div><div></div><div></div>b<script>(M$h=[]).push(_=>(_.a={0:{"#childScope/0":{},"#childScope/1":{},"#childScope/2":{}}}),[])</script>
 
 
 # Render "End"
@@ -12,7 +12,7 @@
     <div />
     b
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{"#scope":1},"#childScope/1":{"#scope":2},"#childScope/2":{"#scope":3},"#scope":0}}),[])
+      (M$h=[]).push(_=&gt;(_.a={0:{"#childScope/0":{},"#childScope/1":{},"#childScope/2":{}}}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/resume.expected.md
index 67a3700a4..44a48511d 100644
--- a/packages/translator-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/resume.expected.md
@@ -14,7 +14,7 @@
     4
     <!--M*0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{b:4,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-derived/template.marko_0_b",])
+      (M$h=[]).push(_=&gt;(_.a={0:{b:4}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-derived/template.marko_0_b",])
     </script>
   </body>
 </html>
@@ -44,7 +44,7 @@ container.querySelector("button").click()
     5
     <!--M*0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{b:4,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-derived/template.marko_0_b",])
+      (M$h=[]).push(_=&gt;(_.a={0:{b:4}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-derived/template.marko_0_b",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/ssr.expected.md
index fad165759..f3a6942b0 100644
--- a/packages/translator-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>Increment</button><!M*0 #button/0>2<!M*0 #text/1> <!>4<!M*0 #text/2><script>(M$h=[]).push(_=>(_.a={0:{b:4,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-derived/template.marko_0_b",])</script>
+  <button>Increment</button><!M*0 #button/0>2<!M*0 #text/1> <!>4<!M*0 #text/2><script>(M$h=[]).push(_=>(_.a={0:{b:4}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-derived/template.marko_0_b",])</script>
 
 
 # Render "End"
@@ -18,7 +18,7 @@
     4
     <!--M*0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{b:4,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-derived/template.marko_0_b",])
+      (M$h=[]).push(_=&gt;(_.a={0:{b:4}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-derived/template.marko_0_b",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/resume.expected.md
index 011d7fb34..67f99475e 100644
--- a/packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/resume.expected.md
@@ -12,7 +12,7 @@
       <!--M*0 #text/1-->
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -38,7 +38,7 @@
       <!--M*0 #text/1-->
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -65,7 +65,7 @@
       <!--M*0 #text/1-->
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/ssr.expected.md
index 85fa30e22..67679ddf1 100644
--- a/packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <span>1<!M*0 #text/0></span><span>0<!M*0 #text/1></span><script>(M$h=[]).push(_=>(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/template.marko_0_x",])</script>
+  <span>1<!M*0 #text/0></span><span>0<!M*0 #text/1></span><script>(M$h=[]).push(_=>(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -16,7 +16,7 @@
       <!--M*0 #text/1-->
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-set-in-effect/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/resume.expected.md
index 1bbe6fa0b..cba5ec55d 100644
--- a/packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/resume.expected.md
@@ -19,7 +19,7 @@
     5
     <!--M*0 #text/4-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -54,7 +54,7 @@ container.querySelector("button").click()
     7
     <!--M*0 #text/4-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -92,7 +92,7 @@ container.querySelector("button").click()
     9
     <!--M*0 #text/4-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -130,7 +130,7 @@ container.querySelector("button").click()
     11
     <!--M*0 #text/4-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/ssr.expected.md
index 41e10cc93..9b8720adb 100644
--- a/packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>1<!M*0 #text/1></button><!M*0 #button/0>2<!M*0 #text/2> <!>3<!M*0 #text/3> <!>5<!M*0 #text/4><script>(M$h=[]).push(_=>(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/template.marko_0_x",])</script>
+  <button>1<!M*0 #text/1></button><!M*0 #button/0>2<!M*0 #text/2> <!>3<!M*0 #text/3> <!>5<!M*0 #text/4><script>(M$h=[]).push(_=>(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -23,7 +23,7 @@
     5
     <!--M*0 #text/4-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag-with-intersection/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/let-tag/__snapshots__/resume.expected.md
index 23f181fa0..a89e3b8fd 100644
--- a/packages/translator-tags/src/__tests__/fixtures/let-tag/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/let-tag/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     1
     <!--M*0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,y:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag/template.marko_0_x_y",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1,y:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag/template.marko_0_x_y",])
     </script>
   </body>
 </html>
@@ -38,7 +38,7 @@ container.querySelector("button").click()
     2
     <!--M*0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,y:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag/template.marko_0_x_y",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1,y:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag/template.marko_0_x_y",])
     </script>
   </body>
 </html>
@@ -66,7 +66,7 @@ container.querySelector("button").click()
     4
     <!--M*0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,y:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag/template.marko_0_x_y",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1,y:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag/template.marko_0_x_y",])
     </script>
   </body>
 </html>
@@ -94,7 +94,7 @@ container.querySelector("button").click()
     8
     <!--M*0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,y:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag/template.marko_0_x_y",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1,y:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag/template.marko_0_x_y",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/let-tag/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/let-tag/__snapshots__/ssr.expected.md
index be5bb6127..4ff14a8d3 100644
--- a/packages/translator-tags/src/__tests__/fixtures/let-tag/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/let-tag/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>1<!M*0 #text/1></button><!M*0 #button/0>1<!M*0 #text/2><script>(M$h=[]).push(_=>(_.a={0:{x:1,y:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag/template.marko_0_x_y",])</script>
+  <button>1<!M*0 #text/1></button><!M*0 #button/0>1<!M*0 #text/2><script>(M$h=[]).push(_=>(_.a={0:{x:1,y:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag/template.marko_0_x_y",])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
     1
     <!--M*0 #text/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:1,y:1,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag/template.marko_0_x_y",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:1,y:1}}),[0,"packages/translator-tags/src/__tests__/fixtures/let-tag/template.marko_0_x_y",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/resume.expected.md
index c1a65569d..a615c0624 100644
--- a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/resume.expected.md
@@ -21,7 +21,7 @@
     </button>
     <!--M*0 #button/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -58,7 +58,7 @@ container.querySelector("#increment")?.click()
     </button>
     <!--M*0 #button/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -96,7 +96,7 @@ container.querySelector("#increment")?.click()
     </button>
     <!--M*0 #button/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -131,7 +131,7 @@ container.querySelector("#increment")?.click()
     </button>
     <!--M*0 #button/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/ssr.expected.md
index 35390fdd9..60e7a51fa 100644
--- a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div>x=<span>0<!M*0 #text/0></span>, was=<!>&zwj;<!M*0 #text/1></div><button id=increment>Increment</button><!M*0 #button/2><script>(M$h=[]).push(_=>(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/template.marko_0_x",])</script>
+  <div>x=<span>0<!M*0 #text/0></span>, was=<!>&zwj;<!M*0 #text/1></div><button id=increment>Increment</button><!M*0 #button/2><script>(M$h=[]).push(_=>(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -25,7 +25,7 @@
     </button>
     <!--M*0 #button/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-assignment/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/__snapshots__/dom.expected/template.js
index 03d3a9dbf..4ebfbe751 100644
--- a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/__snapshots__/dom.expected/template.js
@@ -1,4 +1,4 @@
-import { register as _register, lifecycle as _lifecycle, on as _on, queueSource as _queueSource, createRenderer as _createRenderer, queueEffect as _queueEffect, closure as _closure, conditional as _conditional, value as _value, inConditionalScope as _inConditionalScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { register as _register, lifecycle as _lifecycle, on as _on, queueSource as _queueSource, createRenderer as _createRenderer, queueEffect as _queueEffect, closure as _closure, registerRenderer as _registerRenderer, conditional as _conditional, value as _value, inConditionalScope as _inConditionalScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 const _onMount = _register("packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/template.marko_1/onMount", _scope => {
   const {
     _: {
@@ -28,7 +28,7 @@ const _x$ifBody_effect = _register("packages/translator-tags/src/__tests__/fixtu
   onDestroy: _onDestroy(_scope)
 }));
 const _x$ifBody = /* @__PURE__ */_closure("x", (_scope, x) => _queueEffect(_scope, _x$ifBody_effect));
-const _ifBody = _register("packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/template.marko_1_renderer", /* @__PURE__ */_createRenderer("", "", void 0, [_x$ifBody]));
+const _ifBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/template.marko_1_renderer", /* @__PURE__ */_createRenderer("", "", void 0, [_x$ifBody]));
 const _if = /* @__PURE__ */_conditional("#text/0");
 const _onClick = _scope => {
   const {
diff --git a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/__snapshots__/html.expected/template.js
index 451b2d371..c1f21491a 100644
--- a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/__snapshots__/html.expected/template.js
@@ -10,7 +10,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     _writeScope(_scope1_id, {
       "_": _ensureScopeWithId(_scope0_id)
     });
-    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/template.marko_1_renderer");
+    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-conditional/template.marko_1_renderer", _scope0_id);
     _ifScopeId = _scope1_id;
   }
   _write(`${_markResumeControlSingleNodeEnd(_scope0_id, "#text/0", _ifScopeId)}<div id=ref></div><button id=increment>Increment</button>${_markResumeNode(_scope0_id, "#button/1")}<button id=toggle>Toggle</button>${_markResumeNode(_scope0_id, "#button/2")}`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/resume.expected.md
index 5808d3b80..ba6190ddd 100644
--- a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/resume.expected.md
@@ -15,7 +15,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -46,7 +46,7 @@ container.querySelector("#increment")?.click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -78,7 +78,7 @@ container.querySelector("#increment")?.click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/ssr.expected.md
index 28d9ade01..e155105d4 100644
--- a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div id=ref></div><button id=increment>Increment</button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/template.marko_0_x",])</script>
+  <div id=ref></div><button id=increment>Increment</button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -17,7 +17,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag-this/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/resume.expected.md
index e43a90568..4e580c03a 100644
--- a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/resume.expected.md
@@ -15,7 +15,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -46,7 +46,7 @@ container.querySelector("#increment")?.click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/template.marko_0_x",])
     </script>
   </body>
 </html>
@@ -78,7 +78,7 @@ container.querySelector("#increment")?.click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/ssr.expected.md
index 88c383fe8..aa88be997 100644
--- a/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div id=ref></div><button id=increment>Increment</button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/template.marko_0_x",])</script>
+  <div id=ref></div><button id=increment>Increment</button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/template.marko_0_x",])</script>
 
 
 # Render "End"
@@ -17,7 +17,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{x:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/template.marko_0_x",])
+      (M$h=[]).push(_=&gt;(_.a={0:{x:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/lifecycle-tag/template.marko_0_x",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/resume.expected.md
index 54c78a9cd..0313491cc 100644
--- a/packages/translator-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/resume.expected.md
@@ -14,7 +14,7 @@
     </div>
     <!--M*0 #div/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{"#div/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[])
+      (M$h=[]).push(_=&gt;(_.e={0:{"#div/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/ssr.expected.md
index c7aacc9ac..c1d6e6dba 100644
--- a/packages/translator-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div>a<!M*1 #text/0>b<!M*2 #text/0>c<!M*3 #text/0><!M|0 #div/0 1,2,3></div><!M*0 #div/0><script>(M$h=[]).push(_=>(_.e={0:{"#div/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[])</script>
+  <div>a<!M*1 #text/0>b<!M*2 #text/0>c<!M*3 #text/0><!M|0 #div/0 1,2,3></div><!M*0 #div/0><script>(M$h=[]).push(_=>(_.e={0:{"#div/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[])</script>
 
 
 # Render "End"
@@ -18,7 +18,7 @@
     </div>
     <!--M*0 #div/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{"#div/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[])
+      (M$h=[]).push(_=&gt;(_.e={0:{"#div/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/resume.expected.md
index c8a9a4603..f7f8df55f 100644
--- a/packages/translator-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     <!--M*3 #text/0-->
     <!--M|0 #text/0 1,2,3-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{"#text/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[])
+      (M$h=[]).push(_=&gt;(_.e={0:{"#text/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/ssr.expected.md
index 60ec0f492..1a9476932 100644
--- a/packages/translator-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  a<!M*1 #text/0>b<!M*2 #text/0>c<!M*3 #text/0><!M|0 #text/0 1,2,3><script>(M$h=[]).push(_=>(_.e={0:{"#text/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[])</script>
+  a<!M*1 #text/0>b<!M*2 #text/0>c<!M*3 #text/0><!M|0 #text/0 1,2,3><script>(M$h=[]).push(_=>(_.e={0:{"#text/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[])</script>
 
 
 # Render "End"
@@ -15,7 +15,7 @@
     <!--M*3 #text/0-->
     <!--M|0 #text/0 1,2,3-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{"#text/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[])
+      (M$h=[]).push(_=&gt;(_.e={0:{"#text/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/ssr.expected.md
index bf67a1e82..62b890b85 100644
--- a/packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div></div><!M*0 #div/0><script>(M$h=[]).push(_=>(_.b={0:{"#childScope/1":_.a={"#scope":1},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect-child/components/hello-setter.marko_0_el",])</script>
+  <div></div><!M*0 #div/0><script>(M$h=[]).push(_=>(_.b={0:{"#childScope/1":_.a={}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect-child/components/hello-setter.marko_0_el",])</script>
 
 
 # Render "End"
@@ -10,7 +10,7 @@
     <div />
     <!--M*0 #div/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/1":_.a={"#scope":1},"#scope":0},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect-child/components/hello-setter.marko_0_el",])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/1":_.a={}},1:_.a}),[1,"packages/translator-tags/src/__tests__/fixtures/native-tag-ref-effect-child/components/hello-setter.marko_0_el",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/resume.expected.md
index 5d5fa75ba..0c7c8003c 100644
--- a/packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/resume.expected.md
@@ -19,7 +19,7 @@
       <!--M*0 #text/3-->
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -54,7 +54,7 @@ container.querySelector("button").click()
       <!--M*0 #text/3-->
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -89,7 +89,7 @@ container.querySelector("button").click()
       <!--M*0 #text/3-->
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
@@ -126,7 +126,7 @@ container.querySelector("button").click()
       <!--M*0 #text/3-->
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/ssr.expected.md
index b4c009c46..6e023191b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>0<!M*0 #text/1></button><!M*0 #button/0>used to be <span>0<!M*0 #text/2></span> which should be the same as <span>0<!M*0 #text/3></span><script>(M$h=[]).push(_=>(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/template.marko_0_clickCount",])</script>
+  <button>0<!M*0 #text/1></button><!M*0 #button/0>used to be <span>0<!M*0 #text/2></span> which should be the same as <span>0<!M*0 #text/3></span><script>(M$h=[]).push(_=>(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/template.marko_0_clickCount",])</script>
 
 
 # Render "End"
@@ -23,7 +23,7 @@
       <!--M*0 #text/3-->
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/template.marko_0_clickCount",])
+      (M$h=[]).push(_=&gt;(_.a={0:{clickCount:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/nested-assignment-expression/template.marko_0_clickCount",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/resume.expected.md
index 960c07946..afd067771 100644
--- a/packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/resume.expected.md
@@ -25,7 +25,7 @@
     </button>
     <!--M*0 #button/4-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -66,7 +66,7 @@ container.querySelector("#addTwo").click()
     </button>
     <!--M*0 #button/4-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -109,7 +109,7 @@ container.querySelector("#triple").click()
     </button>
     <!--M*0 #button/4-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -152,7 +152,7 @@ container.querySelector("#cube").click()
     </button>
     <!--M*0 #button/4-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/ssr.expected.md
index a0a3cb2f3..742deb36a 100644
--- a/packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button id=addTwo>0<!M*0 #text/1></button><!M*0 #button/0><button id=triple>0<!M*0 #text/3></button><!M*0 #button/2><button id=cube>0<!M*0 #text/5></button><!M*0 #button/4><script>(M$h=[]).push(_=>(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/template.marko_0_count",])</script>
+  <button id=addTwo>0<!M*0 #text/1></button><!M*0 #button/0><button id=triple>0<!M*0 #text/3></button><!M*0 #button/2><button id=cube>0<!M*0 #text/5></button><!M*0 #button/4><script>(M$h=[]).push(_=>(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/template.marko_0_count",])</script>
 
 
 # Render "End"
@@ -29,7 +29,7 @@
     </button>
     <!--M*0 #button/4-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/reassignment-expression-counter/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/resume.expected.md
index 54c78a9cd..0313491cc 100644
--- a/packages/translator-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/resume.expected.md
@@ -14,7 +14,7 @@
     </div>
     <!--M*0 #div/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{"#div/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[])
+      (M$h=[]).push(_=&gt;(_.e={0:{"#div/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/ssr.expected.md
index c7aacc9ac..c1d6e6dba 100644
--- a/packages/translator-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div>a<!M*1 #text/0>b<!M*2 #text/0>c<!M*3 #text/0><!M|0 #div/0 1,2,3></div><!M*0 #div/0><script>(M$h=[]).push(_=>(_.e={0:{"#div/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[])</script>
+  <div>a<!M*1 #text/0>b<!M*2 #text/0>c<!M*3 #text/0><!M|0 #div/0 1,2,3></div><!M*0 #div/0><script>(M$h=[]).push(_=>(_.e={0:{"#div/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[])</script>
 
 
 # Render "End"
@@ -18,7 +18,7 @@
     </div>
     <!--M*0 #div/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.e={0:{"#div/0(":new Map(_.a=[[1,_.b={"#scope":1}],[2,_.c={"#scope":2}],[3,_.d={"#scope":3}]]),"#scope":0},1:_.b,2:_.c,3:_.d}),[])
+      (M$h=[]).push(_=&gt;(_.e={0:{"#div/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/resume.expected.md
index 1c2a9a4ee..1df14a1de 100644
--- a/packages/translator-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/resume.expected.md
@@ -7,7 +7,7 @@
       child
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={"#scope":1},"#scope":0},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={}},1:_.a}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/ssr.expected.md
index 651770e96..90e71fdf7 100644
--- a/packages/translator-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <span>child</span><script>(M$h=[]).push(_=>(_.b={0:{"#childScope/0":_.a={"#scope":1},"#scope":0},1:_.a}),[])</script>
+  <span>child</span><script>(M$h=[]).push(_=>(_.b={0:{"#childScope/0":_.a={}},1:_.a}),[])</script>
 
 
 # Render "End"
@@ -11,7 +11,7 @@
       child
     </span>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={"#scope":1},"#scope":0},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#childScope/0":_.a={}},1:_.a}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/return-tag/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/return-tag/__snapshots__/ssr.expected.md
index 02b09c69a..8f717f177 100644
--- a/packages/translator-tags/src/__tests__/fixtures/return-tag/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/return-tag/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!M|0 #text/0 1><script>(M$h=[]).push(_=>(_.b={0:{"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/return-tag/template.marko_1_renderer"],"#text/0!":_.a={"#scope":1},"#scope":0},1:_.a}),[])</script>
+  <!M|0 #text/0 1><script>(M$h=[]).push(_=>(_.b={0:{"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/return-tag/template.marko_1_renderer"],"#text/0!":_.a={}},1:_.a}),[])</script>
 
 
 # Render "End"
@@ -8,7 +8,7 @@
 <html>
   <head>
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/return-tag/template.marko_1_renderer"],"#text/0!":_.a={"#scope":1},"#scope":0},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/return-tag/template.marko_1_renderer"],"#text/0!":_.a={}},1:_.a}),[])
     </script>
   </head>
   <body />
diff --git a/packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/resume.expected.md
index 1add21544..1b7a405bd 100644
--- a/packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/resume.expected.md
@@ -13,7 +13,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -42,7 +42,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/template.marko_0_count",])
     </script>
   </body>
 </html>
@@ -72,7 +72,7 @@ container.querySelector("button").click()
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/ssr.expected.md
index 93e03de73..ca563c852 100644
--- a/packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <button>0<!M*0 #text/1> <!>0<!M*0 #text/2></button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/template.marko_0_count",])</script>
+  <button>0<!M*0 #text/1> <!>0<!M*0 #text/2></button><!M*0 #button/0><script>(M$h=[]).push(_=>(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/template.marko_0_count",])</script>
 
 
 # Render "End"
@@ -17,7 +17,7 @@
     </button>
     <!--M*0 #button/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{count:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/template.marko_0_count",])
+      (M$h=[]).push(_=&gt;(_.a={0:{count:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/same-source-non-alias/template.marko_0_count",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/resume.expected.md
index 8887d7715..f8cc9a3bb 100644
--- a/packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/resume.expected.md
@@ -8,7 +8,7 @@
     <div />
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={"#scope":1},"#text/0(":"div","#scope":0},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={},"#text/0(":"div"},1:_.a}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/ssr.expected.md
index 5c3b78ce6..fff03172b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div></div><!M[1><div></div><!M]0 #text/0><script>(M$h=[]).push(_=>(_.b={0:{"#text/0!":_.a={"#scope":1},"#text/0(":"div","#scope":0},1:_.a}),[])</script>
+  <div></div><!M[1><div></div><!M]0 #text/0><script>(M$h=[]).push(_=>(_.b={0:{"#text/0!":_.a={},"#text/0(":"div"},1:_.a}),[])</script>
 
 
 # Render "End"
@@ -12,7 +12,7 @@
     <div />
     <!--M]0 #text/0-->
     <script>
-      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={"#scope":1},"#text/0(":"div","#scope":0},1:_.a}),[])
+      (M$h=[]).push(_=&gt;(_.b={0:{"#text/0!":_.a={},"#text/0(":"div"},1:_.a}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/dom.expected/template.js
index 5d555cfa6..8e66cf4ed 100644
--- a/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
-import { data as _data, createRenderer as _createRenderer, closure as _closure, register as _register, conditional as _conditional, inConditionalScope as _inConditionalScope, intersections as _intersections, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { data as _data, createRenderer as _createRenderer, closure as _closure, registerRenderer as _registerRenderer, conditional as _conditional, inConditionalScope as _inConditionalScope, intersections as _intersections, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 const _value$ifBody = /* @__PURE__ */_closure("value", (_scope, value) => _data(_scope["#text/0"], value));
-const _ifBody = _register("packages/translator-tags/src/__tests__/fixtures/toggle-first-child/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<span> </span>", /* next(1), get */"D ", void 0, [_value$ifBody]));
+const _ifBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/toggle-first-child/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<span> </span>", /* next(1), get */"D ", void 0, [_value$ifBody]));
 const _if = /* @__PURE__ */_conditional("#text/0");
 export const _value_ = /* @__PURE__ */_value("value", (_scope, value) => _if(_scope, value ? _ifBody : null), _intersections([_if, _inConditionalScope(_value$ifBody, "#text/0")]));
 export const _input_ = /* @__PURE__ */_value("input", (_scope, input) => _value_(_scope, input.value), _value_);
diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/html.expected/template.js
index 1bcd674d8..d449d5fc5 100644
--- a/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/html.expected/template.js
@@ -12,7 +12,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
     _writeScope(_scope1_id, {
       "_": _ensureScopeWithId(_scope0_id)
     });
-    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/toggle-first-child/template.marko_1_renderer");
+    _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/toggle-first-child/template.marko_1_renderer", _scope0_id);
     _ifScopeId = _scope1_id;
   }
   _write(`${_markResumeControlSingleNodeEnd(_scope0_id, "#text/0", _ifScopeId)}<span></span><span></span></div>`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/resume.expected.md
index f6bed228a..2fb4cf75e 100644
--- a/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/resume.expected.md
@@ -13,7 +13,7 @@
       <span />
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,value:"Hello","#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-first-child/template.marko_1_renderer"],"#text/0!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={value:"Hello","#text/0!":_.b={}},1:_.b},_.a["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-first-child/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/ssr.expected.md
index b07b6c0f8..63848bce4 100644
--- a/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><span>Hello<!M*1 #text/0></span><!M|0 #text/0 1><span></span><span></span></div><script>(M$h=[]).push(_=>(_.c={0:_.a={"#scope":0,value:"Hello","#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-first-child/template.marko_1_renderer"],"#text/0!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[])</script>
+  <div><span>Hello<!M*1 #text/0></span><!M|0 #text/0 1><span></span><span></span></div><script>(M$h=[]).push(_=>(_.c={0:_.a={value:"Hello","#text/0!":_.b={}},1:_.b},_.a["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-first-child/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[])</script>
 
 
 # Render "End"
@@ -17,7 +17,7 @@
       <span />
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.c={0:_.a={"#scope":0,value:"Hello","#text/0(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-first-child/template.marko_1_renderer"],"#text/0!":_.b={"#scope":1}},1:_.b},_.b._=_.a,_.c),[])
+      (M$h=[]).push(_=&gt;(_.c={0:_.a={value:"Hello","#text/0!":_.b={}},1:_.b},_.a["#text/0("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-first-child/template.marko_1_renderer"](_.a),_.b._=_.a,_.c),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/dom.expected/template.js
index b910c020a..5690ea47d 100644
--- a/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/dom.expected/template.js
@@ -1,4 +1,4 @@
-import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, register as _register, queueEffect as _queueEffect, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, conditional as _conditional, closure as _closure, dynamicSubscribers as _dynamicSubscribers, value as _value, inConditionalScope as _inConditionalScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { on as _on, queueSource as _queueSource, data as _data, createRenderer as _createRenderer, register as _register, queueEffect as _queueEffect, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, registerRenderer as _registerRenderer, conditional as _conditional, closure as _closure, dynamicSubscribers as _dynamicSubscribers, value as _value, inConditionalScope as _inConditionalScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 const _onClick = _scope => {
   const {
     _: {
@@ -16,7 +16,7 @@ const _count$ifBody = _registerSubscriber("packages/translator-tags/src/__tests_
   _data(_scope["#text/1"], count);
   _queueEffect(_scope, _count$ifBody_effect);
 }, _scope => _scope._._));
-const _ifBody2 = _register("packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer", /* @__PURE__ */_createRenderer("<button id=count> </button>", /* get, next(1), get */" D ", void 0, [_count$ifBody]));
+const _ifBody2 = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer", /* @__PURE__ */_createRenderer("<button id=count> </button>", /* get, next(1), get */" D ", void 0, [_count$ifBody]));
 const _if$ifBody = /* @__PURE__ */_conditional("#text/1");
 const _onClick2 = _scope => {
   const {
@@ -33,7 +33,7 @@ const _inner$ifBody = /* @__PURE__ */_closure("inner", (_scope, inner) => {
   _queueEffect(_scope, _inner$ifBody_effect);
   _if$ifBody(_scope, inner ? _ifBody2 : null);
 }, void 0, _if$ifBody);
-const _ifBody = _register("packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<button id=inner></button><!><!>", /* get, over(1), replace */" b%D", void 0, [_inner$ifBody]));
+const _ifBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<button id=inner></button><!><!>", /* get, over(1), replace */" b%D", void 0, [_inner$ifBody]));
 const _if = /* @__PURE__ */_conditional("#text/1");
 const _count = /* @__PURE__ */_value("count", null, _dynamicSubscribers("count"));
 const _inner = /* @__PURE__ */_value("inner", null, _inConditionalScope(_inner$ifBody, "#text/1"));
diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/html.expected/template.js
index 828a4eb25..5a9905527 100644
--- a/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/html.expected/template.js
@@ -18,7 +18,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
       _writeScope(_scope2_id, {
         "_": _ensureScopeWithId(_scope1_id)
       });
-      _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer");
+      _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer", _scope1_id);
       _ifScopeId = _scope2_id;
     }
     _write(`${_markResumeControlSingleNodeEnd(_scope1_id, "#text/1", _ifScopeId)}`);
@@ -28,7 +28,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
       "#text/1(": _ifRenderer,
       "#text/1!": _getScopeById(_ifScopeId)
     });
-    _register(_ifRenderer2 = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer");
+    _register(_ifRenderer2 = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer", _scope0_id);
     _ifScopeId2 = _scope1_id;
   }
   _write(`${_markResumeControlEnd(_scope0_id, "#text/1")}</div>`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/resume.expected.md
index 4398294b1..7d194916f 100644
--- a/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/resume.expected.md
@@ -24,7 +24,7 @@
       <!--M]0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,outer:!0,inner:!0,count:0,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"],"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b._=_.a,_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={outer:!0,inner:!0,count:0,"#text/1!":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"](_.a),_.b._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"](_.b),_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
     </script>
   </body>
 </html>
@@ -64,7 +64,7 @@ container.querySelector("#count").click()
       <!--M]0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,outer:!0,inner:!0,count:0,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"],"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b._=_.a,_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={outer:!0,inner:!0,count:0,"#text/1!":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"](_.a),_.b._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"](_.b),_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
     </script>
   </body>
 </html>
@@ -104,7 +104,7 @@ container.querySelector("#count").click()
       <!--M]0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,outer:!0,inner:!0,count:0,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"],"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b._=_.a,_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={outer:!0,inner:!0,count:0,"#text/1!":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"](_.a),_.b._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"](_.b),_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
     </script>
   </body>
 </html>
@@ -138,7 +138,7 @@ container.querySelector("#inner").click()
       <!--M]0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,outer:!0,inner:!0,count:0,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"],"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b._=_.a,_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={outer:!0,inner:!0,count:0,"#text/1!":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"](_.a),_.b._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"](_.b),_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
     </script>
   </body>
 </html>
@@ -178,7 +178,7 @@ container.querySelector("#inner").click()
       <!--M]0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,outer:!0,inner:!0,count:0,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"],"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b._=_.a,_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={outer:!0,inner:!0,count:0,"#text/1!":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"](_.a),_.b._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"](_.b),_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
     </script>
   </body>
 </html>
@@ -218,7 +218,7 @@ container.querySelector("#count").click()
       <!--M]0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,outer:!0,inner:!0,count:0,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"],"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b._=_.a,_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={outer:!0,inner:!0,count:0,"#text/1!":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"](_.a),_.b._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"](_.b),_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
     </script>
   </body>
 </html>
@@ -245,7 +245,7 @@ container.querySelector("#outer").click()
       <!--M]0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,outer:!0,inner:!0,count:0,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"],"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b._=_.a,_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={outer:!0,inner:!0,count:0,"#text/1!":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"](_.a),_.b._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"](_.b),_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
     </script>
   </body>
 </html>
@@ -286,7 +286,7 @@ container.querySelector("#outer").click()
       <!---->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,outer:!0,inner:!0,count:0,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"],"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b._=_.a,_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={outer:!0,inner:!0,count:0,"#text/1!":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"](_.a),_.b._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"](_.b),_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
     </script>
   </body>
 </html>
@@ -327,7 +327,7 @@ container.querySelector("#count").click()
       <!---->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,outer:!0,inner:!0,count:0,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"],"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b._=_.a,_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={outer:!0,inner:!0,count:0,"#text/1!":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"](_.a),_.b._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"](_.b),_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/ssr.expected.md
index 095247255..66a51517b 100644
--- a/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><button id=outer></button><!M*0 #button/0><!M[1><button id=inner></button><!M*1 #button/0><button id=count>0<!M*2 #text/1></button><!M*2 #button/0><!M|1 #text/1 2><!M]0 #text/1></div><script>(M$h=[]).push(_=>(_.d={0:_.a={"#scope":0,outer:!0,inner:!0,count:0,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"],"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b._=_.a,_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])</script>
+  <div><button id=outer></button><!M*0 #button/0><!M[1><button id=inner></button><!M*1 #button/0><button id=count>0<!M*2 #text/1></button><!M*2 #button/0><!M|1 #text/1 2><!M]0 #text/1></div><script>(M$h=[]).push(_=>(_.d={0:_.a={outer:!0,inner:!0,count:0,"#text/1!":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"](_.a),_.b._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"](_.b),_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])</script>
 
 
 # Render "End"
@@ -28,7 +28,7 @@
       <!--M]0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.d={0:_.a={"#scope":0,outer:!0,inner:!0,count:0,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"],"#text/1!":_.b={"#scope":1,"#text/1(":_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"],"#text/1!":_.c={"#scope":2}}},1:_.b,2:_.c},_.b._=_.a,_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
+      (M$h=[]).push(_=&gt;(_.d={0:_.a={outer:!0,inner:!0,count:0,"#text/1!":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.a["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_renderer"](_.a),_.b._=_.a,_.b["#text/1("]=_._["packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_renderer"](_.b),_.c._=_.b,_.d),[2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count/subscriber",2,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_2_count",1,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_1_inner",0,"packages/translator-tags/src/__tests__/fixtures/toggle-nested-2/template.marko_0_outer",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/dom.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/dom.expected/template.js
index b57283a05..08256b1cd 100644
--- a/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/dom.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/dom.expected/template.js
@@ -1,13 +1,13 @@
-import { data as _data, createRenderer as _createRenderer, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, register as _register, conditional as _conditional, closure as _closure, inConditionalScope as _inConditionalScope, dynamicSubscribers as _dynamicSubscribers, intersections as _intersections, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
+import { data as _data, createRenderer as _createRenderer, dynamicClosure as _dynamicClosure, registerSubscriber as _registerSubscriber, registerRenderer as _registerRenderer, conditional as _conditional, closure as _closure, inConditionalScope as _inConditionalScope, dynamicSubscribers as _dynamicSubscribers, intersections as _intersections, value as _value, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
 const _value2$ifBody = _registerSubscriber("packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_3_value2/subscriber", /* @__PURE__ */_dynamicClosure("value2", (_scope, value2) => _data(_scope["#text/0"], value2), _scope => _scope._._));
-const _ifBody3 = _register("packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_3_renderer", /* @__PURE__ */_createRenderer("<span> </span>", /* next(1), get */"D ", void 0, [_value2$ifBody]));
+const _ifBody3 = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_3_renderer", /* @__PURE__ */_createRenderer("<span> </span>", /* next(1), get */"D ", void 0, [_value2$ifBody]));
 const _value1$ifBody = _registerSubscriber("packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_2_value1/subscriber", /* @__PURE__ */_dynamicClosure("value1", (_scope, value1) => _data(_scope["#text/0"], value1), _scope => _scope._._));
-const _ifBody2 = _register("packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_2_renderer", /* @__PURE__ */_createRenderer("<span> </span>", /* next(1), get */"D ", void 0, [_value1$ifBody]));
+const _ifBody2 = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_2_renderer", /* @__PURE__ */_createRenderer("<span> </span>", /* next(1), get */"D ", void 0, [_value1$ifBody]));
 const _if$ifBody2 = /* @__PURE__ */_conditional("#text/1");
 const _if$ifBody = /* @__PURE__ */_conditional("#text/0");
 const _value2$ifBody2 = /* @__PURE__ */_closure("value2", (_scope, value2) => _if$ifBody2(_scope, value2 ? _ifBody3 : null), void 0, _if$ifBody2);
 const _value1$ifBody2 = /* @__PURE__ */_closure("value1", (_scope, value1) => _if$ifBody(_scope, value1 ? _ifBody2 : null), void 0, _if$ifBody);
-const _ifBody = _register("packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<!><!><!><!>", /* replace, over(1), replace */"D%b%D", void 0, [_value1$ifBody2, _value2$ifBody2]));
+const _ifBody = _registerRenderer("packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<!><!><!><!>", /* replace, over(1), replace */"D%b%D", void 0, [_value1$ifBody2, _value2$ifBody2]));
 const _if = /* @__PURE__ */_conditional("#text/0");
 export const _value2_ = /* @__PURE__ */_value("value2", null, _intersections([_inConditionalScope(_value2$ifBody2, "#text/0"), _dynamicSubscribers("value2")]));
 export const _value1_ = /* @__PURE__ */_value("value1", null, _intersections([_inConditionalScope(_value1$ifBody2, "#text/0"), _dynamicSubscribers("value1")]));
diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/html.expected/template.js b/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/html.expected/template.js
index 3d1e33722..b4f3443c1 100644
--- a/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/html.expected/template.js
+++ b/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/html.expected/template.js
@@ -19,7 +19,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
       _writeScope(_scope2_id, {
         "_": _ensureScopeWithId(_scope1_id)
       });
-      _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_2_renderer");
+      _register(_ifRenderer = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_2_renderer", _scope1_id);
       _ifScopeId = _scope2_id;
     }
     _write(`${_markResumeControlSingleNodeEnd(_scope1_id, "#text/0", _ifScopeId)}`);
@@ -31,7 +31,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
       _writeScope(_scope3_id, {
         "_": _ensureScopeWithId(_scope1_id)
       });
-      _register(_ifRenderer2 = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_3_renderer");
+      _register(_ifRenderer2 = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_3_renderer", _scope1_id);
       _ifScopeId2 = _scope3_id;
     }
     _write(`${_markResumeControlSingleNodeEnd(_scope1_id, "#text/1", _ifScopeId2)}`);
@@ -42,7 +42,7 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
       "#text/1(": _ifRenderer2,
       "#text/1!": _getScopeById(_ifScopeId2)
     });
-    _register(_ifRenderer3 = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_1_renderer");
+    _register(_ifRenderer3 = /* @__PURE__ */_createRenderer(() => {}), "packages/translator-tags/src/__tests__/fixtures/toggle-nested/template.marko_1_renderer", _scope0_id);
     _ifScopeId3 = _scope1_id;
   }
   _write(`${_markResumeControlEnd(_scope0_id, "#text/0")}</div>`);
diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/resume.expected.md
index 151178a3d..c145ba916 100644
--- a/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/resume.expected.md
@@ -7,7 +7,7 @@
       <!--M]0 #text/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{value1:"Hello",value2:"World","#scope":0}}),[])
+      (M$h=[]).push(_=&gt;(_.a={0:{value1:"Hello",value2:"World"}}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/ssr.expected.md
index 0c3e14cf7..8c5d2d453 100644
--- a/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div><!M]0 #text/0></div><script>(M$h=[]).push(_=>(_.a={0:{value1:"Hello",value2:"World","#scope":0}}),[])</script>
+  <div><!M]0 #text/0></div><script>(M$h=[]).push(_=>(_.a={0:{value1:"Hello",value2:"World"}}),[])</script>
 
 
 # Render "End"
@@ -11,7 +11,7 @@
       <!--M]0 #text/0-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{value1:"Hello",value2:"World","#scope":0}}),[])
+      (M$h=[]).push(_=&gt;(_.a={0:{value1:"Hello",value2:"World"}}),[])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/resume.expected.md
index a570efe92..11b9fe8a0 100644
--- a/packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/resume.expected.md
@@ -19,7 +19,7 @@
     />
     <!--M*0 #div/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{input:{value:{a:1,b:2}},a:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/template.marko_0_input_a",0,"packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/template.marko_0_input",])
+      (M$h=[]).push(_=&gt;(_.a={0:{input:{value:{a:1,b:2}},a:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/template.marko_0_input_a",0,"packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/template.marko_0_input",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/ssr.expected.md
index 2478b1026..3286d7217 100644
--- a/packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div a=1 b=2></div><!M*0 #div/0><div a=1 b=2></div><!M*0 #div/1><div a=0 b=2></div><!M*0 #div/2><script>(M$h=[]).push(_=>(_.a={0:{input:{value:{a:1,b:2}},a:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/template.marko_0_input_a",0,"packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/template.marko_0_input",])</script>
+  <div a=1 b=2></div><!M*0 #div/0><div a=1 b=2></div><!M*0 #div/1><div a=0 b=2></div><!M*0 #div/2><script>(M$h=[]).push(_=>(_.a={0:{input:{value:{a:1,b:2}},a:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/template.marko_0_input_a",0,"packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/template.marko_0_input",])</script>
 
 
 # Render "End"
@@ -23,7 +23,7 @@
     />
     <!--M*0 #div/2-->
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{input:{value:{a:1,b:2}},a:0,"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/template.marko_0_input_a",0,"packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/template.marko_0_input",])
+      (M$h=[]).push(_=&gt;(_.a={0:{input:{value:{a:1,b:2}},a:0}}),[0,"packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/template.marko_0_input_a",0,"packages/translator-tags/src/__tests__/fixtures/update-dynamic-attrs/template.marko_0_input",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/resume.expected.md b/packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/resume.expected.md
index 3f2a2856c..da136e6f8 100644
--- a/packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/resume.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/resume.expected.md
@@ -12,7 +12,7 @@
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{input:{value:0},"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/template.marko_0_input",])
+      (M$h=[]).push(_=&gt;(_.a={0:{input:{value:0}}}),[0,"packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/template.marko_0_input",])
     </script>
   </body>
 </html>
@@ -38,7 +38,7 @@
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{input:{value:0},"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/template.marko_0_input",])
+      (M$h=[]).push(_=&gt;(_.a={0:{input:{value:0}}}),[0,"packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/template.marko_0_input",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/ssr.expected.md b/packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/ssr.expected.md
index 721c9be94..8756e136c 100644
--- a/packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/ssr.expected.md
+++ b/packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <div>0<!M*0 #text/0> <!>0<!M*0 #text/1></div><script>(M$h=[]).push(_=>(_.a={0:{input:{value:0},"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/template.marko_0_input",])</script>
+  <div>0<!M*0 #text/0> <!>0<!M*0 #text/1></div><script>(M$h=[]).push(_=>(_.a={0:{input:{value:0}}}),[0,"packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/template.marko_0_input",])</script>
 
 
 # Render "End"
@@ -16,7 +16,7 @@
       <!--M*0 #text/1-->
     </div>
     <script>
-      (M$h=[]).push(_=&gt;(_.a={0:{input:{value:0},"#scope":0}}),[0,"packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/template.marko_0_input",])
+      (M$h=[]).push(_=&gt;(_.a={0:{input:{value:0}}}),[0,"packages/translator-tags/src/__tests__/fixtures/user-effect-abort-signal/template.marko_0_input",])
     </script>
   </body>
 </html>
diff --git a/packages/translator-tags/src/core/condition/if.ts b/packages/translator-tags/src/core/condition/if.ts
index 861b76d14..9e44123ff 100644
--- a/packages/translator-tags/src/core/condition/if.ts
+++ b/packages/translator-tags/src/core/condition/if.ts
@@ -211,14 +211,14 @@ export const translate = {
         for (let i = branches.length; i--; ) {
           const { tag, section } = branches[i];
           const [testAttr] = tag.node.attributes;
-          const id = writer.getRenderer(section);
+          const id = t.identifier(section.name);
 
           setSubscriberBuilder(tag, (subscriber) => {
             return callRuntime(
               "inConditionalScope",
               subscriber,
               getScopeAccessorLiteral(nodeRef),
-              /*writer.getRenderer(section)*/
+              /*t.identifier(section.name)*/
             );
           });
 
@@ -272,6 +272,8 @@ export const translate = {
                     ),
                   ),
                   t.stringLiteral(getResumeRegisterId(section, "renderer")),
+                  section.closures.size &&
+                    getScopeIdIdentifier(section.parent!),
                 ),
               ) as any,
             );
diff --git a/packages/translator-tags/src/core/define.ts b/packages/translator-tags/src/core/define.ts
index 68320a33e..d198da03f 100644
--- a/packages/translator-tags/src/core/define.ts
+++ b/packages/translator-tags/src/core/define.ts
@@ -67,7 +67,7 @@ export default {
               callRuntime(
                 "bindRenderer",
                 scopeIdentifier,
-                writer.getRenderer(tagBodySection),
+                t.identifier(tagBodySection.name),
               ),
             ),
           );
diff --git a/packages/translator-tags/src/core/for.ts b/packages/translator-tags/src/core/for.ts
index 5c02a7ad8..cc89a59c9 100644
--- a/packages/translator-tags/src/core/for.ts
+++ b/packages/translator-tags/src/core/for.ts
@@ -203,7 +203,7 @@ const translateDOM = {
 
     tag.remove();
 
-    const rendererId = writer.getRenderer(bodySection);
+    const rendererId = t.identifier(bodySection.name);
     const ofAttr = findName(attributes, "of");
     const toAttr = findName(attributes, "to");
     const inAttr = findName(attributes, "in");
diff --git a/packages/translator-tags/src/util/attrs-to-object.ts b/packages/translator-tags/src/util/attrs-to-object.ts
index 90821cfb3..00e2e1f57 100644
--- a/packages/translator-tags/src/util/attrs-to-object.ts
+++ b/packages/translator-tags/src/util/attrs-to-object.ts
@@ -6,7 +6,7 @@ import { getScopeAccessorLiteral } from "./references";
 import { callRuntime } from "./runtime";
 import { createScopeReadPattern } from "./scope-read";
 import { getScopeIdIdentifier, getSection, type Section } from "./sections";
-import { getSerializedScopeProperties } from "./signals";
+import { getResumeRegisterId, getSerializedScopeProperties } from "./signals";
 import toPropertyName from "./to-property-name";
 
 const renderBodyProps = new WeakMap<t.Expression, t.ArrowFunctionExpression>();
@@ -136,20 +136,34 @@ export default function attrsToObject(
     }
 
     if (body.length) {
+      const renderBodySection = getSection(tag.get("body"));
       const renderBodyExpression = t.arrowFunctionExpression(
         params,
         t.blockStatement(body),
       );
 
       renderBodyProps.set(result, renderBodyExpression);
-      (result as t.ObjectExpression).properties.push(
-        t.objectProperty(
-          t.identifier("renderBody"),
-          isOutputHTML()
-            ? callRuntime("createRenderer", renderBodyExpression)
-            : renderBodyExpression,
-        ),
-      );
+
+      if (isOutputHTML()) {
+        (result as t.ObjectExpression).properties.push(
+          t.objectProperty(
+            t.identifier("renderBody"),
+            callRuntime(
+              "register",
+              callRuntime("createRenderer", renderBodyExpression),
+              t.stringLiteral(
+                getResumeRegisterId(renderBodySection, "renderer"),
+              ),
+              renderBodySection.closures.size &&
+                getScopeIdIdentifier(renderBodySection.parent!),
+            ),
+          ),
+        );
+      } else {
+        (result as t.ObjectExpression).properties.push(
+          t.objectProperty(t.identifier("renderBody"), renderBodyExpression),
+        );
+      }
     }
   }
 
diff --git a/packages/translator-tags/src/util/writer.ts b/packages/translator-tags/src/util/writer.ts
index cf7eb5707..168ded1a1 100644
--- a/packages/translator-tags/src/util/writer.ts
+++ b/packages/translator-tags/src/util/writer.ts
@@ -19,13 +19,6 @@ import toTemplateOrStringLiteral, {
 } from "./to-template-string-or-literal";
 import { getWalkString } from "./walks";
 
-const [getRenderer] = createSectionState<t.Identifier>(
-  "renderer",
-  (section: Section) => t.identifier(section.name),
-);
-
-export { getRenderer };
-
 const [getWrites] = createSectionState<(string | t.Expression)[]>(
   "writes",
   () => [""],
diff --git a/packages/translator-tags/src/visitors/program/dom.ts b/packages/translator-tags/src/visitors/program/dom.ts
index 98101efee..f42e6230b 100644
--- a/packages/translator-tags/src/visitors/program/dom.ts
+++ b/packages/translator-tags/src/visitors/program/dom.ts
@@ -42,7 +42,7 @@ export default {
             sectionParamsBinding && initValue(sectionParamsBinding);
           const { walks, writes, setup } = writer.getSectionMeta(childSection);
           const closures = getClosures(childSection);
-          const identifier = writer.getRenderer(childSection);
+          const identifier = t.identifier(childSection.name);
           const renderer = callRuntime(
             "createRenderer",
             writes,
@@ -59,7 +59,9 @@ export default {
                 identifier,
                 isStatefulSection(childSection)
                   ? callRuntime(
-                      "register",
+                      childSection.closures.size
+                        ? "registerRenderer"
+                        : "register",
                       t.stringLiteral(
                         getResumeRegisterId(childSection, "renderer"),
                       ),
diff --git a/packages/translator-tags/src/visitors/tag/custom-tag.ts b/packages/translator-tags/src/visitors/tag/custom-tag.ts
index b19c926db..e45f0d518 100644
--- a/packages/translator-tags/src/visitors/tag/custom-tag.ts
+++ b/packages/translator-tags/src/visitors/tag/custom-tag.ts
@@ -159,8 +159,8 @@ function translateHTML(tag: t.NodePath<t.MarkoTag>) {
     );
 
     if (renderBodyProp) {
-      const renderBodySection = getSection(tag.get("body"));
       renderBodyId = tag.scope.generateUidIdentifier("renderBody");
+      const renderBodySection = getSection(tag.get("body"));
       const [renderBodyPath] = tag.insertBefore(
         t.variableDeclaration("const", [
           t.variableDeclarator(
@@ -178,8 +178,8 @@ function translateHTML(tag: t.NodePath<t.MarkoTag>) {
               t.stringLiteral(
                 getResumeRegisterId(renderBodySection, "renderer"),
               ),
-              (section.closures.size || tag.node.var) &&
-                getScopeIdIdentifier(section),
+              renderBodySection.closures.size &&
+                getScopeIdIdentifier(renderBodySection.parent!),
             ),
           ),
         ]),
@@ -276,7 +276,7 @@ function translateDOM(tag: t.NodePath<t.MarkoTag>) {
             callRuntime(
               "bindRenderer",
               scopeIdentifier,
-              writer.getRenderer(tagBodySection),
+              t.identifier(tagBodySection.name),
             ),
           ),
         );
@@ -356,7 +356,7 @@ function translateDOM(tag: t.NodePath<t.MarkoTag>) {
           callRuntime(
             "bindRenderer",
             scopeIdentifier,
-            writer.getRenderer(tagBodySection),
+            t.identifier(tagBodySection.name),
           ),
           createScopeReadExpression(tagSection, childScopeBinding),
           callRuntime(
diff --git a/packages/translator-tags/src/visitors/tag/dynamic-tag.ts b/packages/translator-tags/src/visitors/tag/dynamic-tag.ts
index 22fecf5bd..d222f3ea4 100644
--- a/packages/translator-tags/src/visitors/tag/dynamic-tag.ts
+++ b/packages/translator-tags/src/visitors/tag/dynamic-tag.ts
@@ -165,7 +165,6 @@ export default {
         ];
 
         if (t.isObjectExpression(attrsObject) && renderBodyProp) {
-          const section = getSection(tag);
           const renderBodySection = getSection(tag.get("body"));
           attrsObject.properties.pop();
           args.push(
@@ -182,8 +181,8 @@ export default {
               t.stringLiteral(
                 getResumeRegisterId(renderBodySection, "renderer"),
               ),
-              (section.closures.size || tag.node.var) &&
-                getScopeIdIdentifier(section),
+              renderBodySection.closures.size &&
+                getScopeIdIdentifier(renderBodySection.parent!),
             ),
           );
         }
@@ -227,7 +226,7 @@ export default {
         const section = getSection(tag);
         const bodySection = getSection(tag.get("body"));
         const hasBody = section !== bodySection;
-        const renderBodyIdentifier = hasBody && writer.getRenderer(bodySection);
+        const renderBodyIdentifier = hasBody && t.identifier(bodySection.name);
         const signal = getSignal(section, nodeRef, "dynamicTagName");
         signal.build = () => {
           return callRuntime(
diff --git a/scripts/babel-register.js b/scripts/babel-register.js
index d860f0a04..2229af233 100644
--- a/scripts/babel-register.js
+++ b/scripts/babel-register.js
@@ -8,5 +8,5 @@ require("@babel/register")({
     "@babel/plugin-transform-modules-commonjs",
     "@babel/plugin-transform-export-namespace-from",
   ],
-  presets: ["@babel/preset-typescript"],
+  presets: [["@babel/preset-typescript", { allowDeclareFields: true }]],
 });