diff --git a/.changeset/wise-times-remain.md b/.changeset/wise-times-remain.md
new file mode 100644
index 000000000..4bba993ed
--- /dev/null
+++ b/.changeset/wise-times-remain.md
@@ -0,0 +1,5 @@
+---
+"@marko/runtime-tags": patch
+---
+
+Encode resume effects as a string to reduce HTML bytes and fix browser compatibility issue with large effect lists.
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-increment/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-increment/__snapshots__/resume.expected.md
index 448574075..c30e77753 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-increment/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-increment/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
         }], _.a.$fooChange = _._[
           "__tests__/template.marko_0/foo"
           ](_.a), _.b),
-        "__tests__/template.marko_0_foo_$fooChange",
-        1
+        "__tests__/template.marko_0_foo_$fooChange 1"
       ];
       M._.w()
     </script>
@@ -53,8 +52,7 @@ container.querySelector("button").click();
         }], _.a.$fooChange = _._[
           "__tests__/template.marko_0/foo"
           ](_.a), _.b),
-        "__tests__/template.marko_0_foo_$fooChange",
-        1
+        "__tests__/template.marko_0_foo_$fooChange 1"
       ];
       M._.w()
     </script>
@@ -92,8 +90,7 @@ container.querySelector("button").click();
         }], _.a.$fooChange = _._[
           "__tests__/template.marko_0/foo"
           ](_.a), _.b),
-        "__tests__/template.marko_0_foo_$fooChange",
-        1
+        "__tests__/template.marko_0_foo_$fooChange 1"
       ];
       M._.w()
     </script>
@@ -131,8 +128,7 @@ container.querySelector("button").click();
         }], _.a.$fooChange = _._[
           "__tests__/template.marko_0/foo"
           ](_.a), _.b),
-        "__tests__/template.marko_0_foo_$fooChange",
-        1
+        "__tests__/template.marko_0_foo_$fooChange 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-increment/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-increment/__snapshots__/ssr.expected.md
index 014a49bea..6f464fda6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-increment/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-increment/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*1 #text/1-->:<!>0<!--M_*1 #text/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={foo:0}],_.a.$fooChange=_._["__tests__/template.marko_0/foo"](_.a),_.b),"__tests__/template.marko_0_foo_$fooChange",1];M._.w()</script>
+  <button>0<!--M_*1 #text/1-->:<!>0<!--M_*1 #text/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={foo:0}],_.a.$fooChange=_._["__tests__/template.marko_0/foo"](_.a),_.b),"__tests__/template.marko_0_foo_$fooChange 1"];M._.w()</script>
 ```
 
 # Render End
@@ -24,8 +24,7 @@
         }], _.a.$fooChange = _._[
           "__tests__/template.marko_0/foo"
           ](_.a), _.b),
-        "__tests__/template.marko_0_foo_$fooChange",
-        1
+        "__tests__/template.marko_0_foo_$fooChange 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-reduced/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-reduced/__snapshots__/resume.expected.md
index 193c07d4f..376b795ae 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-reduced/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-reduced/__snapshots__/resume.expected.md
@@ -13,8 +13,7 @@
         }, _.b], _.a.valueChange = _.b.$valueChange = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input_$valueChange",
-        2
+        "__tests__/tags/child.marko_0_input_$valueChange 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-reduced/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-reduced/__snapshots__/ssr.expected.md
index 603c93e8b..3d52878d2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-reduced/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-destructured-reduced/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.d={"#childScope/0":_.b={input:_.a={value:0}}},_.b],_.a.valueChange=_.b.$valueChange=_._["__tests__/template.marko_0/valueChange"](_.d),_.c),"__tests__/tags/child.marko_0_input_$valueChange",2];M._.w()</script>
+  <script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.d={"#childScope/0":_.b={input:_.a={value:0}}},_.b],_.a.valueChange=_.b.$valueChange=_._["__tests__/template.marko_0/valueChange"](_.d),_.c),"__tests__/tags/child.marko_0_input_$valueChange 2"];M._.w()</script>
 ```
 
 # Render End
@@ -18,8 +18,7 @@
         }, _.b], _.a.valueChange = _.b.$valueChange = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input_$valueChange",
-        2
+        "__tests__/tags/child.marko_0_input_$valueChange 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-destructured/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-destructured/__snapshots__/resume.expected.md
index dd97a82fd..408e9d3a4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-destructured/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-destructured/__snapshots__/resume.expected.md
@@ -17,8 +17,7 @@
         }], _.a.$fooChange = _._[
           "__tests__/template.marko_0/foo"
           ](_.a), _.b),
-        "__tests__/template.marko_0_bar_$fooChange",
-        1
+        "__tests__/template.marko_0_bar_$fooChange 1"
       ];
       M._.w()
     </script>
@@ -49,8 +48,7 @@ container.querySelector("button").click();
         }], _.a.$fooChange = _._[
           "__tests__/template.marko_0/foo"
           ](_.a), _.b),
-        "__tests__/template.marko_0_bar_$fooChange",
-        1
+        "__tests__/template.marko_0_bar_$fooChange 1"
       ];
       M._.w()
     </script>
@@ -85,8 +83,7 @@ container.querySelector("button").click();
         }], _.a.$fooChange = _._[
           "__tests__/template.marko_0/foo"
           ](_.a), _.b),
-        "__tests__/template.marko_0_bar_$fooChange",
-        1
+        "__tests__/template.marko_0_bar_$fooChange 1"
       ];
       M._.w()
     </script>
@@ -121,8 +118,7 @@ container.querySelector("button").click();
         }], _.a.$fooChange = _._[
           "__tests__/template.marko_0/foo"
           ](_.a), _.b),
-        "__tests__/template.marko_0_bar_$fooChange",
-        1
+        "__tests__/template.marko_0_bar_$fooChange 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-destructured/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-destructured/__snapshots__/ssr.expected.md
index 70b3aea98..70443ad3b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-destructured/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-destructured/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>1:<!>0<!--M_*1 #text/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={bar:0}],_.a.$fooChange=_._["__tests__/template.marko_0/foo"](_.a),_.b),"__tests__/template.marko_0_bar_$fooChange",1];M._.w()</script>
+  <button>1:<!>0<!--M_*1 #text/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={bar:0}],_.a.$fooChange=_._["__tests__/template.marko_0/foo"](_.a),_.b),"__tests__/template.marko_0_bar_$fooChange 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
         }], _.a.$fooChange = _._[
           "__tests__/template.marko_0/foo"
           ](_.a), _.b),
-        "__tests__/template.marko_0_bar_$fooChange",
-        1
+        "__tests__/template.marko_0_bar_$fooChange 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-in-wrapped-function/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-in-wrapped-function/__snapshots__/resume.expected.md
index cb9342b87..c8295fd8d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-in-wrapped-function/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-in-wrapped-function/__snapshots__/resume.expected.md
@@ -14,8 +14,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -43,8 +42,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -76,8 +74,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -109,8 +106,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-in-wrapped-function/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-in-wrapped-function/__snapshots__/ssr.expected.md
index 54dd49ee7..676a16d7e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-in-wrapped-function/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-in-wrapped-function/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -19,8 +19,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-live-read/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-live-read/__snapshots__/resume.expected.md
index 61feeb7a0..40cf6adcc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-live-read/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-live-read/__snapshots__/resume.expected.md
@@ -17,10 +17,7 @@
         }], _.a.resetCount = _._[
           "__tests__/template.marko_0/resetCount"
           ](_.a), _.b),
-        "__tests__/template.marko_0_resetCount",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_resetCount 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -51,10 +48,7 @@ container.querySelector("button").click();
         }], _.a.resetCount = _._[
           "__tests__/template.marko_0/resetCount"
           ](_.a), _.b),
-        "__tests__/template.marko_0_resetCount",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_resetCount 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -89,10 +83,7 @@ container.querySelector("button").click();
         }], _.a.resetCount = _._[
           "__tests__/template.marko_0/resetCount"
           ](_.a), _.b),
-        "__tests__/template.marko_0_resetCount",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_resetCount 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -127,10 +118,7 @@ container.querySelector("button").click();
         }], _.a.resetCount = _._[
           "__tests__/template.marko_0/resetCount"
           ](_.a), _.b),
-        "__tests__/template.marko_0_resetCount",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_resetCount 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-live-read/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-live-read/__snapshots__/ssr.expected.md
index 768567fa5..f9fd34efe 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-live-read/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-live-read/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><button></button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={count:0}],_.a.resetCount=_._["__tests__/template.marko_0/resetCount"](_.a),_.b),"__tests__/template.marko_0_resetCount",1,"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><button></button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={count:0}],_.a.resetCount=_._["__tests__/template.marko_0/resetCount"](_.a),_.b),"__tests__/template.marko_0_resetCount 1 __tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,10 +22,7 @@
         }], _.a.resetCount = _._[
           "__tests__/template.marko_0/resetCount"
           ](_.a), _.b),
-        "__tests__/template.marko_0_resetCount",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_resetCount 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-to-owner-closure/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-to-owner-closure/__snapshots__/resume.expected.md
index 3d658d149..e4132b1a9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-to-owner-closure/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-to-owner-closure/__snapshots__/resume.expected.md
@@ -12,8 +12,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2
+        "__tests__/template.marko_1 2"
       ];
       M._.w()
     </script>
@@ -38,8 +37,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2
+        "__tests__/template.marko_1 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-to-owner-closure/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-to-owner-closure/__snapshots__/ssr.expected.md
index 12477c1bb..d308bbf1e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-to-owner-closure/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-to-owner-closure/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button></button><!--M_*2 #button/0--><!--M_|1 #text/0 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={},{_:_.a}]),"__tests__/template.marko_1",2];M._.w()</script>
+  <button></button><!--M_*2 #button/0--><!--M_|1 #text/0 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={},{_:_.a}]),"__tests__/template.marko_1 2"];M._.w()</script>
 ```
 
 # Render End
@@ -17,8 +17,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2
+        "__tests__/template.marko_1 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let-with-change-handler/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let-with-change-handler/__snapshots__/resume.expected.md
index deb433125..b89063c24 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let-with-change-handler/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let-with-change-handler/__snapshots__/resume.expected.md
@@ -16,8 +16,7 @@
       M._.r = [_ =&gt; (_.b = [0, _.a = {}], _.a["TagVariableChange:count"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -47,8 +46,7 @@ container.querySelector("button").click();
       M._.r = [_ =&gt; (_.b = [0, _.a = {}], _.a["TagVariableChange:count"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let-with-change-handler/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let-with-change-handler/__snapshots__/ssr.expected.md
index ea636a391..cde0964ac 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let-with-change-handler/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let-with-change-handler/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Before</button><!--M_*1 #button/0--><div>0<!--M_*1 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={}],_.a["TagVariableChange:count"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0",1];M._.w()</script>
+  <button>Before</button><!--M_*1 #button/0--><div>0<!--M_*1 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={}],_.a["TagVariableChange:count"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -21,8 +21,7 @@
       M._.r = [_ =&gt; (_.b = [0, _.a = {}], _.a["TagVariableChange:count"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let/__snapshots__/resume.expected.md
index 2b207f524..60d337e80 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let/__snapshots__/resume.expected.md
@@ -11,8 +11,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -37,8 +36,7 @@ container.querySelector("button").click();
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let/__snapshots__/ssr.expected.md
index 7f143bac7..dda6106b8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-to-pruned-let/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Before</button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <button>Before</button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -16,8 +16,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/async-multi-resolve-in-order-and-update/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/async-multi-resolve-in-order-and-update/__snapshots__/resume.expected.md
index e9e357757..b6a0dde79 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/async-multi-resolve-in-order-and-update/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/async-multi-resolve-in-order-and-update/__snapshots__/resume.expected.md
@@ -76,8 +76,8 @@
         {}]), _ =&gt; (_.e = [
         {}]), _ =&gt; (_.f = [
         {}]),
-        "__tests__/template.marko_0_n",
-        1);
+        "__tests__/template.marko_0_n 1"
+        );
       M._.w()
     </script>
   </body>
@@ -151,8 +151,8 @@ container.querySelector("button").click();
         {}]), _ =&gt; (_.e = [
         {}]), _ =&gt; (_.f = [
         {}]),
-        "__tests__/template.marko_0_n",
-        1);
+        "__tests__/template.marko_0_n 1"
+        );
       M._.w()
     </script>
   </body>
@@ -271,8 +271,8 @@ REMOVE #document-fragment/#text1 after html/body/p4/#comment2
         {}]), _ =&gt; (_.e = [
         {}]), _ =&gt; (_.f = [
         {}]),
-        "__tests__/template.marko_0_n",
-        1);
+        "__tests__/template.marko_0_n 1"
+        );
       M._.w()
     </script>
   </body>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/async-multi-resolve-in-order-and-update/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/async-multi-resolve-in-order-and-update/__snapshots__/ssr.expected.md
index d28611684..99f1554da 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/async-multi-resolve-in-order-and-update/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/async-multi-resolve-in-order-and-update/__snapshots__/ssr.expected.md
@@ -5,7 +5,7 @@
 
 # Write
 ```html
-  <!--M_[-->2<!--M_*2 #text/0--><!--M_]1 #text/2 2--></p><p>2 * <!>2<!--M_*1 #text/3--> = <!--M_[-->4<!--M_*3 #text/0--><!--M_]1 #text/4 3--></p><p>3 * <!>2<!--M_*1 #text/5--> = <!--M_[-->6<!--M_*4 #text/0--><!--M_]1 #text/6 4--></p><p>4 * <!>2<!--M_*1 #text/7--> = <!--M_[-->8<!--M_*5 #text/0--><!--M_]1 #text/8 5--></p><p>5 * <!>2<!--M_*1 #text/9--> = <!--M_[-->10<!--M_*6 #text/0--><!--M_]1 #text/10 6--></p><script>M._.r.push(_=>(_.b=[{}]),_=>(_.c=[{}]),_=>(_.d=[{}]),_=>(_.e=[{}]),_=>(_.f=[{}]),"__tests__/template.marko_0_n",1);M._.w()</script>
+  <!--M_[-->2<!--M_*2 #text/0--><!--M_]1 #text/2 2--></p><p>2 * <!>2<!--M_*1 #text/3--> = <!--M_[-->4<!--M_*3 #text/0--><!--M_]1 #text/4 3--></p><p>3 * <!>2<!--M_*1 #text/5--> = <!--M_[-->6<!--M_*4 #text/0--><!--M_]1 #text/6 4--></p><p>4 * <!>2<!--M_*1 #text/7--> = <!--M_[-->8<!--M_*5 #text/0--><!--M_]1 #text/8 5--></p><p>5 * <!>2<!--M_*1 #text/9--> = <!--M_[-->10<!--M_*6 #text/0--><!--M_]1 #text/10 6--></p><script>M._.r.push(_=>(_.b=[{}]),_=>(_.c=[{}]),_=>(_.d=[{}]),_=>(_.e=[{}]),_=>(_.f=[{}]),"__tests__/template.marko_0_n 1");M._.w()</script>
 ```
 
 # Render ASYNC
@@ -130,8 +130,8 @@ INSERT html/body/p/script
         {}]), _ =&gt; (_.e = [
         {}]), _ =&gt; (_.f = [
         {}]),
-        "__tests__/template.marko_0_n",
-        1);
+        "__tests__/template.marko_0_n 1"
+        );
       M._.w()
     </script>
   </body>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/async-reject-then-resolve-before-and-after-isolated-boundaries/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/async-reject-then-resolve-before-and-after-isolated-boundaries/__snapshots__/resume.expected.md
index b1c264692..18d8d02e6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/async-reject-then-resolve-before-and-after-isolated-boundaries/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/async-reject-then-resolve-before-and-after-isolated-boundaries/__snapshots__/resume.expected.md
@@ -56,8 +56,8 @@
     <script>
       M._.r.push(_ =&gt; (_.f = [2,
         {}]),
-        "__tests__/template.marko_9",
-        7);
+        "__tests__/template.marko_9 7"
+        );
       M._.w()
     </script>
   </body>
@@ -126,8 +126,8 @@ container.querySelector("button").click();
     <script>
       M._.r.push(_ =&gt; (_.f = [2,
         {}]),
-        "__tests__/template.marko_9",
-        7);
+        "__tests__/template.marko_9 7"
+        );
       M._.w()
     </script>
   </body>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/async-reject-then-resolve-before-and-after-isolated-boundaries/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/async-reject-then-resolve-before-and-after-isolated-boundaries/__snapshots__/ssr.expected.md
index 48ff1c4ea..e463660a4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/async-reject-then-resolve-before-and-after-isolated-boundaries/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/async-reject-then-resolve-before-and-after-isolated-boundaries/__snapshots__/ssr.expected.md
@@ -10,7 +10,7 @@
 
 # Write
 ```html
-  <div>Resolved A: A Value</div><!--M_!b--><!--M_]1 #text/0 2--><!--M_[--><!--M_!^c--><!--M_!c--><!--M_]1 #text/1 3--><!--M_[--><!--M_!^d--><!--M_[--><div>Resolved C: C Value</div><button>Before</button><!--M_*7 #button/1--><!--M_]4 #text/0 7--><!--M_!d--><!--M_]1 #text/2 4--><script>M._.r.push(_=>(_.f=[2,{}]),"__tests__/template.marko_9",7);M._.w()</script>
+  <div>Resolved A: A Value</div><!--M_!b--><!--M_]1 #text/0 2--><!--M_[--><!--M_!^c--><!--M_!c--><!--M_]1 #text/1 3--><!--M_[--><!--M_!^d--><!--M_[--><div>Resolved C: C Value</div><button>Before</button><!--M_*7 #button/1--><!--M_]4 #text/0 7--><!--M_!d--><!--M_]1 #text/2 4--><script>M._.r.push(_=>(_.f=[2,{}]),"__tests__/template.marko_9 7");M._.w()</script>
 ```
 
 # Render ASYNC
@@ -159,8 +159,8 @@ INSERT html/body/script1
     <script>
       M._.r.push(_ =&gt; (_.f = [2,
         {}]),
-        "__tests__/template.marko_9",
-        7);
+        "__tests__/template.marko_9 7"
+        );
       M._.w()
     </script>
   </body>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/async-state/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/async-state/__snapshots__/resume.expected.md
index 58200aae1..0e02a9b17 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/async-state/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/async-state/__snapshots__/resume.expected.md
@@ -31,8 +31,7 @@
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -83,8 +82,7 @@ container.querySelector("button").click();
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -128,8 +126,7 @@ container.querySelector("button").click();
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -188,8 +185,7 @@ REMOVE #document-fragment/#text2 after html/body/#text
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -245,8 +241,7 @@ container.querySelector("button").click();
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -290,8 +285,7 @@ container.querySelector("button").click();
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -350,8 +344,7 @@ REMOVE #document-fragment/#text2 after html/body/#text
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
diff --git a/packages/runtime-tags/src/__tests__/fixtures/async-state/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/async-state/__snapshots__/ssr.expected.md
index eec1cba60..6add36a80 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/async-state/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/async-state/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>inc</button><!--M_*1 #button/0--><!--M_[--><!--M_!^2-->LOADING...<!--M_!2--><!--M_]1 #text/1 2--><style M_>t{display:none}</style><t M_=2><!--M_#b--></t><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={clickCount:0,"ClosureScopes:clickCount":_.d=new Set},_.b={_:_.a,"ClosureSignalIndex:clickCount":0,"#BranchAccessor":"#text/1"}],_.b["#PlaceholderContent"]=_._["__tests__/template.marko_2_content"](_.a),(_.d).add(_.b),_.c),"__tests__/template.marko_0_clickCount",1];REORDER_RUNTIME(M._);M._.w()</script>
+  <button>inc</button><!--M_*1 #button/0--><!--M_[--><!--M_!^2-->LOADING...<!--M_!2--><!--M_]1 #text/1 2--><style M_>t{display:none}</style><t M_=2><!--M_#b--></t><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={clickCount:0,"ClosureScopes:clickCount":_.d=new Set},_.b={_:_.a,"ClosureSignalIndex:clickCount":0,"#BranchAccessor":"#text/1"}],_.b["#PlaceholderContent"]=_._["__tests__/template.marko_2_content"](_.a),(_.d).add(_.b),_.c),"__tests__/template.marko_0_clickCount 1"];REORDER_RUNTIME(M._);M._.w()</script>
 ```
 
 # Write
@@ -40,8 +40,7 @@
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -106,8 +105,7 @@ INSERT html/body/script
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/resume.expected.md
index 6da496c37..f95a7ff3c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/resume.expected.md
@@ -23,8 +23,7 @@
           }
         }, _.a,
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -62,8 +61,7 @@ container.querySelector("button").click();
           }
         }, _.a,
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -106,8 +104,7 @@ container.querySelector("button").click();
           }
         }, _.a,
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -145,8 +142,7 @@ container.querySelector("button").click();
           }
         }, _.a,
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/ssr.expected.md
index 2b73591dc..520987814 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[-->y: <!>1<!--M_*3 #text/0--><!--M_]2 #text/0 3--><button>Toggle</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{x:!0,"#childScope/0":_.a={"ConditionalRenderer:#text/0":"__tests__/template.marko_1_content"}},_.a,{}]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <!--M_[-->y: <!>1<!--M_*3 #text/0--><!--M_]2 #text/0 3--><button>Toggle</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{x:!0,"#childScope/0":_.a={"ConditionalRenderer:#text/0":"__tests__/template.marko_1_content"}},_.a,{}]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -28,8 +28,7 @@
           }
         }, _.a,
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/resume.expected.md
index b9ecb2900..6b35cf594 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/resume.expected.md
@@ -187,20 +187,7 @@
             ](_.s), _.m.content = _._[
             "__tests__/template.marko_4_content"
             ](_.s), _.r),
-        "__tests__/tags/hello/index.marko_1_item",
-        3, 5, 7,
-        "__tests__/tags/hello/index.marko_3_row",
-        11, 13,
-        "__tests__/tags/hello/index.marko_2_col",
-        9,
-        "__tests__/tags/hello/index.marko_3_row",
-        17, 19,
-        "__tests__/tags/hello/index.marko_2_col",
-        15,
-        "__tests__/tags/hello/index.marko_3_row",
-        23,
-        "__tests__/tags/hello/index.marko_2_col",
-        21
+        "__tests__/tags/hello/index.marko_1_item 3 5 7 __tests__/tags/hello/index.marko_3_row 11 13 __tests__/tags/hello/index.marko_2_col 9 __tests__/tags/hello/index.marko_3_row 17 19 __tests__/tags/hello/index.marko_2_col 15 __tests__/tags/hello/index.marko_3_row 23 __tests__/tags/hello/index.marko_2_col 21"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/ssr.expected.md
index c8c2656b3..9bd0e6095 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div class=item style=color:red>foo</div><!--M_*3 #div/0--><div class=item style=color:blue>bar</div><!--M_*5 #div/0--><div class=item style=color:green>bar</div><!--M_*7 #div/0--><div class=col x=0 row="[object Object]"></div><!--M_*9 #div/0--><div class=row row=a>a<!--M_*12 #text/0--></div><!--M_*11 #div/0--><div class=row row=b>b<!--M_*14 #text/0--></div><!--M_*13 #div/0--><div class=col x=1 row="[object Object]"></div><!--M_*15 #div/0--><div class=row row=c>c<!--M_*18 #text/0--></div><!--M_*17 #div/0--><div class=row row=d>d<!--M_*20 #text/0--></div><!--M_*19 #div/0--><div class=col outside row="[object Object]"></div><!--M_*21 #div/0--><div class=row row=-1>Outside</div><!--M_*23 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.r=[0,2,{item:_.a={style:{color:"red"},content:_.s={},*[(_.b=[,_.c={style:{color:"blue"}},_.d={style:{color:"green"}}],Symbol.iterator)](){yield*_.b}}},1,{item:_.c},1,{item:_.d},1,{col:_.i={x:0,row:_.e={row:"a",*[(_.f=[,_.g={row:"b"}],Symbol.iterator)](){yield*_.f}},*[(_.h=[,_.o={x:1,row:_.j={row:"c",*[(_.k=[,_.l={row:"d"}],Symbol.iterator)](){yield*_.k}}},_.q={outside:!0,row:_.m={row:-1,*[Symbol.iterator](){yield this}}}],Symbol.iterator)](){yield*_.h}}},1,_.n={},{},{row:_.g},{},{col:_.o},1,_.p={},{},{row:_.l},{},{col:_.q},1,{row:_.m}],_.b[0]=_.a,_.f[0]=_.n.row=_.e,_.h[0]=_.i,_.k[0]=_.p.row=_.j,_.a.content=_._["__tests__/template.marko_1_content"](_.s),_.c.content=_._["__tests__/template.marko_2_content"](_.s),_.d.content=_._["__tests__/template.marko_2_content"](_.s),_.e.content=_._["__tests__/template.marko_3_content"](_.s),_.g.content=_._["__tests__/template.marko_3_content"](_.s),_.j.content=_._["__tests__/template.marko_3_content"](_.s),_.l.content=_._["__tests__/template.marko_3_content"](_.s),_.m.content=_._["__tests__/template.marko_4_content"](_.s),_.r),"__tests__/tags/hello/index.marko_1_item",3,5,7,"__tests__/tags/hello/index.marko_3_row",11,13,"__tests__/tags/hello/index.marko_2_col",9,"__tests__/tags/hello/index.marko_3_row",17,19,"__tests__/tags/hello/index.marko_2_col",15,"__tests__/tags/hello/index.marko_3_row",23,"__tests__/tags/hello/index.marko_2_col",21];M._.w()</script>
+  <div class=item style=color:red>foo</div><!--M_*3 #div/0--><div class=item style=color:blue>bar</div><!--M_*5 #div/0--><div class=item style=color:green>bar</div><!--M_*7 #div/0--><div class=col x=0 row="[object Object]"></div><!--M_*9 #div/0--><div class=row row=a>a<!--M_*12 #text/0--></div><!--M_*11 #div/0--><div class=row row=b>b<!--M_*14 #text/0--></div><!--M_*13 #div/0--><div class=col x=1 row="[object Object]"></div><!--M_*15 #div/0--><div class=row row=c>c<!--M_*18 #text/0--></div><!--M_*17 #div/0--><div class=row row=d>d<!--M_*20 #text/0--></div><!--M_*19 #div/0--><div class=col outside row="[object Object]"></div><!--M_*21 #div/0--><div class=row row=-1>Outside</div><!--M_*23 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.r=[0,2,{item:_.a={style:{color:"red"},content:_.s={},*[(_.b=[,_.c={style:{color:"blue"}},_.d={style:{color:"green"}}],Symbol.iterator)](){yield*_.b}}},1,{item:_.c},1,{item:_.d},1,{col:_.i={x:0,row:_.e={row:"a",*[(_.f=[,_.g={row:"b"}],Symbol.iterator)](){yield*_.f}},*[(_.h=[,_.o={x:1,row:_.j={row:"c",*[(_.k=[,_.l={row:"d"}],Symbol.iterator)](){yield*_.k}}},_.q={outside:!0,row:_.m={row:-1,*[Symbol.iterator](){yield this}}}],Symbol.iterator)](){yield*_.h}}},1,_.n={},{},{row:_.g},{},{col:_.o},1,_.p={},{},{row:_.l},{},{col:_.q},1,{row:_.m}],_.b[0]=_.a,_.f[0]=_.n.row=_.e,_.h[0]=_.i,_.k[0]=_.p.row=_.j,_.a.content=_._["__tests__/template.marko_1_content"](_.s),_.c.content=_._["__tests__/template.marko_2_content"](_.s),_.d.content=_._["__tests__/template.marko_2_content"](_.s),_.e.content=_._["__tests__/template.marko_3_content"](_.s),_.g.content=_._["__tests__/template.marko_3_content"](_.s),_.j.content=_._["__tests__/template.marko_3_content"](_.s),_.l.content=_._["__tests__/template.marko_3_content"](_.s),_.m.content=_._["__tests__/template.marko_4_content"](_.s),_.r),"__tests__/tags/hello/index.marko_1_item 3 5 7 __tests__/tags/hello/index.marko_3_row 11 13 __tests__/tags/hello/index.marko_2_col 9 __tests__/tags/hello/index.marko_3_row 17 19 __tests__/tags/hello/index.marko_2_col 15 __tests__/tags/hello/index.marko_3_row 23 __tests__/tags/hello/index.marko_2_col 21"];M._.w()</script>
 ```
 
 # Render End
@@ -192,20 +192,7 @@
             ](_.s), _.m.content = _._[
             "__tests__/template.marko_4_content"
             ](_.s), _.r),
-        "__tests__/tags/hello/index.marko_1_item",
-        3, 5, 7,
-        "__tests__/tags/hello/index.marko_3_row",
-        11, 13,
-        "__tests__/tags/hello/index.marko_2_col",
-        9,
-        "__tests__/tags/hello/index.marko_3_row",
-        17, 19,
-        "__tests__/tags/hello/index.marko_2_col",
-        15,
-        "__tests__/tags/hello/index.marko_3_row",
-        23,
-        "__tests__/tags/hello/index.marko_2_col",
-        21
+        "__tests__/tags/hello/index.marko_1_item 3 5 7 __tests__/tags/hello/index.marko_3_row 11 13 __tests__/tags/hello/index.marko_2_col 9 __tests__/tags/hello/index.marko_3_row 17 19 __tests__/tags/hello/index.marko_2_col 15 __tests__/tags/hello/index.marko_3_row 23 __tests__/tags/hello/index.marko_2_col 21"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-for-loop-param-intersection-closure/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/at-tags-for-loop-param-intersection-closure/__snapshots__/resume.expected.md
index b5c3f7d77..9bf5db5ed 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-for-loop-param-intersection-closure/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-for-loop-param-intersection-closure/__snapshots__/resume.expected.md
@@ -34,8 +34,7 @@
           _: _.a,
           "ClosureSignalIndex:mult": 0
         }], (_.c).add(_.d), _.c.add(_.e), _.c.add(_.f), _.b),
-        "__tests__/template.marko_0_mult",
-        1
+        "__tests__/template.marko_0_mult 1"
       ];
       M._.w()
     </script>
@@ -83,8 +82,7 @@ container.querySelector("button").click();
           _: _.a,
           "ClosureSignalIndex:mult": 0
         }], (_.c).add(_.d), _.c.add(_.e), _.c.add(_.f), _.b),
-        "__tests__/template.marko_0_mult",
-        1
+        "__tests__/template.marko_0_mult 1"
       ];
       M._.w()
     </script>
@@ -139,8 +137,7 @@ container.querySelector("button").click();
           _: _.a,
           "ClosureSignalIndex:mult": 0
         }], (_.c).add(_.d), _.c.add(_.e), _.c.add(_.f), _.b),
-        "__tests__/template.marko_0_mult",
-        1
+        "__tests__/template.marko_0_mult 1"
       ];
       M._.w()
     </script>
@@ -195,8 +192,7 @@ container.querySelector("button").click();
           _: _.a,
           "ClosureSignalIndex:mult": 0
         }], (_.c).add(_.d), _.c.add(_.e), _.c.add(_.f), _.b),
-        "__tests__/template.marko_0_mult",
-        1
+        "__tests__/template.marko_0_mult 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-for-loop-param-intersection-closure/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/at-tags-for-loop-param-intersection-closure/__snapshots__/ssr.expected.md
index 0615de7d1..ab4b65c4c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-for-loop-param-intersection-closure/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-for-loop-param-intersection-closure/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  2<!--M_*4 #text/0-->4<!--M_*6 #text/0-->6<!--M_*8 #text/0--><button>Multiplier: <!>2<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={mult:2,"ClosureScopes:mult":_.c=new Set},2,_.d={item:1,_:_.a,"ClosureSignalIndex:mult":0},1,_.e={item:2,_:_.a,"ClosureSignalIndex:mult":0},1,_.f={item:3,_:_.a,"ClosureSignalIndex:mult":0}],(_.c).add(_.d),_.c.add(_.e),_.c.add(_.f),_.b),"__tests__/template.marko_0_mult",1];M._.w()</script>
+  2<!--M_*4 #text/0-->4<!--M_*6 #text/0-->6<!--M_*8 #text/0--><button>Multiplier: <!>2<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={mult:2,"ClosureScopes:mult":_.c=new Set},2,_.d={item:1,_:_.a,"ClosureSignalIndex:mult":0},1,_.e={item:2,_:_.a,"ClosureSignalIndex:mult":0},1,_.f={item:3,_:_.a,"ClosureSignalIndex:mult":0}],(_.c).add(_.d),_.c.add(_.e),_.c.add(_.f),_.b),"__tests__/template.marko_0_mult 1"];M._.w()</script>
 ```
 
 # Render End
@@ -39,8 +39,7 @@
           _: _.a,
           "ClosureSignalIndex:mult": 0
         }], (_.c).add(_.d), _.c.add(_.e), _.c.add(_.f), _.b),
-        "__tests__/template.marko_0_mult",
-        1
+        "__tests__/template.marko_0_mult 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/resume.expected.md
index ee07da03f..b89da129f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/resume.expected.md
@@ -18,8 +18,7 @@
         {
           disabled: !0
         }]),
-        "__tests__/template.marko_0_disabled",
-        1
+        "__tests__/template.marko_0_disabled 1"
       ];
       M._.w()
     </script>
@@ -49,8 +48,7 @@ container.querySelector("button").click();
         {
           disabled: !0
         }]),
-        "__tests__/template.marko_0_disabled",
-        1
+        "__tests__/template.marko_0_disabled 1"
       ];
       M._.w()
     </script>
@@ -87,8 +85,7 @@ container.querySelector("button").click();
         {
           disabled: !0
         }]),
-        "__tests__/template.marko_0_disabled",
-        1
+        "__tests__/template.marko_0_disabled 1"
       ];
       M._.w()
     </script>
@@ -123,8 +120,7 @@ container.querySelector("button").click();
         {
           disabled: !0
         }]),
-        "__tests__/template.marko_0_disabled",
-        1
+        "__tests__/template.marko_0_disabled 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/ssr.expected.md
index 4f4e4b241..e532bf200 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <input disabled><!--M_*1 #input/0--><button>enable<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{disabled:!0}]),"__tests__/template.marko_0_disabled",1];M._.w()</script>
+  <input disabled><!--M_*1 #input/0--><button>enable<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{disabled:!0}]),"__tests__/template.marko_0_disabled 1"];M._.w()</script>
 ```
 
 # Render End
@@ -23,8 +23,7 @@
         {
           disabled: !0
         }]),
-        "__tests__/template.marko_0_disabled",
-        1
+        "__tests__/template.marko_0_disabled 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/await-remove-parent/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/await-remove-parent/__snapshots__/resume.expected.md
index 0d2c3b1c8..6e12770f8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/await-remove-parent/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/await-remove-parent/__snapshots__/resume.expected.md
@@ -23,8 +23,7 @@
         }], _.a["#PlaceholderContent"] = _._[
           "__tests__/template.marko_3_content"
           ](_.c), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -37,8 +36,8 @@
       M._.j.b = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_4",
-          5)
+          "__tests__/template.marko_4 5"
+          )
       };
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/await-remove-parent/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/await-remove-parent/__snapshots__/ssr.expected.md
index 625d0d32a..227fe0f9c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/await-remove-parent/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/await-remove-parent/__snapshots__/ssr.expected.md
@@ -1,11 +1,11 @@
 # Write
 ```html
-  <div id=outside>Pass</div><!--M_[--><!--M_[--><!--M_!^3-->loading...<!--M_!3--><!--M_]2 #text/0 3--><!--M_]1 #text/0 2--><style M_>t{display:none}</style><t M_=3><!--M_#b--></t><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{},_.c={},_.a={"#BranchAccessor":"#text/0"}],_.a["#PlaceholderContent"]=_._["__tests__/template.marko_3_content"](_.c),_.b),"__tests__/template.marko_0",1];REORDER_RUNTIME(M._);M._.w()</script>
+  <div id=outside>Pass</div><!--M_[--><!--M_[--><!--M_!^3-->loading...<!--M_!3--><!--M_]2 #text/0 3--><!--M_]1 #text/0 2--><style M_>t{display:none}</style><t M_=3><!--M_#b--></t><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{},_.c={},_.a={"#BranchAccessor":"#text/0"}],_.a["#PlaceholderContent"]=_._["__tests__/template.marko_3_content"](_.c),_.b),"__tests__/template.marko_0 1"];REORDER_RUNTIME(M._);M._.w()</script>
 ```
 
 # Write
 ```html
-  <t M_=b></t><script>M._.r.push(_=>(_.d=[1,{"#ClosestBranchId":2}]));M._.j.b=_=>{_.push("__tests__/template.marko_4",5)};M._.w()</script>
+  <t M_=b></t><script>M._.r.push(_=>(_.d=[1,{"#ClosestBranchId":2}]));M._.j.b=_=>{_.push("__tests__/template.marko_4 5")};M._.w()</script>
 ```
 
 # Render ASYNC
@@ -39,8 +39,7 @@
         }], _.a["#PlaceholderContent"] = _._[
           "__tests__/template.marko_3_content"
           ](_.c), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -101,8 +100,7 @@ INSERT html/body/script
         }], _.a["#PlaceholderContent"] = _._[
           "__tests__/template.marko_3_content"
           ](_.c), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -115,8 +113,8 @@ INSERT html/body/script
       M._.j.b = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_4",
-          5)
+          "__tests__/template.marko_4 5"
+          )
       };
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/resume.expected.md
index 2fc5cf5e1..14c2f0a93 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/resume.expected.md
@@ -51,8 +51,8 @@
           _: _.b,
           "ClosureSignalIndex:count": 1
         }], _.d.add(_.i), _.h),
-        "__tests__/template.marko_0_count",
-        1);
+        "__tests__/template.marko_0_count 1"
+        );
       M._.w()
     </script>
   </body>
@@ -116,8 +116,8 @@ container.querySelector("button").click();
           _: _.b,
           "ClosureSignalIndex:count": 1
         }], _.d.add(_.i), _.h),
-        "__tests__/template.marko_0_count",
-        1);
+        "__tests__/template.marko_0_count 1"
+        );
       M._.w()
     </script>
   </body>
@@ -187,8 +187,8 @@ container.querySelector("button").click();
           _: _.b,
           "ClosureSignalIndex:count": 1
         }], _.d.add(_.i), _.h),
-        "__tests__/template.marko_0_count",
-        1);
+        "__tests__/template.marko_0_count 1"
+        );
       M._.w()
     </script>
   </body>
@@ -258,8 +258,8 @@ container.querySelector("button").click();
           _: _.b,
           "ClosureSignalIndex:count": 1
         }], _.d.add(_.i), _.h),
-        "__tests__/template.marko_0_count",
-        1);
+        "__tests__/template.marko_0_count 1"
+        );
       M._.w()
     </script>
   </body>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/ssr.expected.md
index b455bf8d9..f5828cba4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/ssr.expected.md
@@ -10,7 +10,7 @@
 
 # Write
 ```html
-  <!--M_[-->Got: b <!>0<!--M_*4 #text/1--><!--M_]1 #text/1 4--><!--M_[-->Got: c <!>0<!--M_*3 #text/1--><!--M_]1 #text/2 3--><button>Inc</button><!--M_*1 #button/3--></div><script>M._.r.push(_=>(_.h=[_.i={_:_.b,"ClosureSignalIndex:count":1}],_.d.add(_.i),_.h),"__tests__/template.marko_0_count",1);M._.w()</script>
+  <!--M_[-->Got: b <!>0<!--M_*4 #text/1--><!--M_]1 #text/1 4--><!--M_[-->Got: c <!>0<!--M_*3 #text/1--><!--M_]1 #text/2 3--><button>Inc</button><!--M_*1 #button/3--></div><script>M._.r.push(_=>(_.h=[_.i={_:_.b,"ClosureSignalIndex:count":1}],_.d.add(_.i),_.h),"__tests__/template.marko_0_count 1");M._.w()</script>
 ```
 
 # Render ASYNC
@@ -151,8 +151,8 @@ INSERT html/body/div/script1
           _: _.b,
           "ClosureSignalIndex:count": 1
         }], _.d.add(_.i), _.h),
-        "__tests__/template.marko_0_count",
-        1);
+        "__tests__/template.marko_0_count 1"
+        );
       M._.w()
     </script>
   </body>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/await-update-before-resume/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/await-update-before-resume/__snapshots__/resume.expected.md
index a2708bc64..b5eb5b790 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/await-update-before-resume/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/await-update-before-resume/__snapshots__/resume.expected.md
@@ -31,8 +31,7 @@
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -45,10 +44,8 @@
       M._.j.b = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_3",
-          4,
-          "__tests__/template.marko_3_value",
-          4)
+          "__tests__/template.marko_3 4 __tests__/template.marko_3_value 4"
+          )
       };
       M._.w()
     </script>
@@ -93,8 +90,7 @@
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -107,10 +103,8 @@
       M._.j.b = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_3",
-          4,
-          "__tests__/template.marko_3_value",
-          4)
+          "__tests__/template.marko_3 4 __tests__/template.marko_3_value 4"
+          )
       };
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/await-update-before-resume/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/await-update-before-resume/__snapshots__/ssr.expected.md
index f94493b1d..38d4d71ba 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/await-update-before-resume/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/await-update-before-resume/__snapshots__/ssr.expected.md
@@ -1,11 +1,11 @@
 # Write
 ```html
-  <div id=outside>0<!--M_*1 #text/0--></div><!--M_[--><!--M_!^2-->loading...<!--M_!2--><!--M_]1 #text/1 2--><style M_>t{display:none}</style><t M_=2><!--M_#b--></t><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"ClosureScopes:value":_.d=new Set},_.b={_:_.a,"ClosureSignalIndex:value":0,"#BranchAccessor":"#text/1"}],_.b["#PlaceholderContent"]=_._["__tests__/template.marko_2_content"](_.a),(_.d).add(_.b),_.c),"__tests__/template.marko_0",1];REORDER_RUNTIME(M._);M._.w()</script>
+  <div id=outside>0<!--M_*1 #text/0--></div><!--M_[--><!--M_!^2-->loading...<!--M_!2--><!--M_]1 #text/1 2--><style M_>t{display:none}</style><t M_=2><!--M_#b--></t><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"ClosureScopes:value":_.d=new Set},_.b={_:_.a,"ClosureSignalIndex:value":0,"#BranchAccessor":"#text/1"}],_.b["#PlaceholderContent"]=_._["__tests__/template.marko_2_content"](_.a),(_.d).add(_.b),_.c),"__tests__/template.marko_0 1"];REORDER_RUNTIME(M._);M._.w()</script>
 ```
 
 # Write
 ```html
-  <t M_=b><!--M_[--><div id=inside>0<!--M_*4 #text/0--></div><!--M_]2 #text/0 4--></t><script>M._.r.push(_=>(_.e=[1,{value:0}]));M._.j.b=_=>{_.push("__tests__/template.marko_3",4,"__tests__/template.marko_3_value",4)};M._.w()</script>
+  <t M_=b><!--M_[--><div id=inside>0<!--M_*4 #text/0--></div><!--M_]2 #text/0 4--></t><script>M._.r.push(_=>(_.e=[1,{value:0}]));M._.j.b=_=>{_.push("__tests__/template.marko_3 4 __tests__/template.marko_3_value 4")};M._.w()</script>
 ```
 
 # Render ASYNC
@@ -41,8 +41,7 @@
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -112,8 +111,7 @@ INSERT html/body/script
         }], _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       REORDER_RUNTIME(M._);
       M._.w()
@@ -126,10 +124,8 @@ INSERT html/body/script
       M._.j.b = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_3",
-          4,
-          "__tests__/template.marko_3_value",
-          4)
+          "__tests__/template.marko_3 4 __tests__/template.marko_3_value 4"
+          )
       };
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/resume.expected.md
index 9681f3c5a..a33f4ab7b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/resume.expected.md
@@ -16,8 +16,7 @@
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
@@ -47,8 +46,7 @@ container.querySelector("button").click();
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/ssr.expected.md
index c50225c77..0840d3b8f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={clickCount:0,"#childScope/0":_.a={}},_.a],_.a.onClick=_._["__tests__/template.marko_0/onClick"](_.c),_.b),"__tests__/tags/my-button.marko_0_onClick",2];M._.w()</script>
+  <button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={clickCount:0,"#childScope/0":_.a={}},_.a],_.a.onClick=_._["__tests__/template.marko_0/onClick"](_.c),_.b),"__tests__/tags/my-button.marko_0_onClick 2"];M._.w()</script>
 ```
 
 # Render End
@@ -21,8 +21,7 @@
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/resume.expected.md
index 58431490e..605336c5b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/resume.expected.md
@@ -16,8 +16,7 @@
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
@@ -47,8 +46,7 @@ container.querySelector("button").click();
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
@@ -82,8 +80,7 @@ container.querySelector("button").click();
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/ssr.expected.md
index c50225c77..0840d3b8f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={clickCount:0,"#childScope/0":_.a={}},_.a],_.a.onClick=_._["__tests__/template.marko_0/onClick"](_.c),_.b),"__tests__/tags/my-button.marko_0_onClick",2];M._.w()</script>
+  <button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={clickCount:0,"#childScope/0":_.a={}},_.a],_.a.onClick=_._["__tests__/template.marko_0/onClick"](_.c),_.b),"__tests__/tags/my-button.marko_0_onClick 2"];M._.w()</script>
 ```
 
 # Render End
@@ -21,8 +21,7 @@
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/resume.expected.md
index f611ebc4f..c30a182a9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/resume.expected.md
@@ -32,8 +32,7 @@
           ](_.d), _.b.onClick = _._[
           "__tests__/template.marko_0/onClick2"
           ](_.d), _.c),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2, 3
+        "__tests__/tags/my-button.marko_0_onClick 2 3"
       ];
       M._.w()
     </script>
@@ -79,8 +78,7 @@ container.querySelector("button").click();
           ](_.d), _.b.onClick = _._[
           "__tests__/template.marko_0/onClick2"
           ](_.d), _.c),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2, 3
+        "__tests__/tags/my-button.marko_0_onClick 2 3"
       ];
       M._.w()
     </script>
@@ -133,8 +131,7 @@ container.querySelector("button").click();
           ](_.d), _.b.onClick = _._[
           "__tests__/template.marko_0/onClick2"
           ](_.d), _.c),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2, 3
+        "__tests__/tags/my-button.marko_0_onClick 2 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/ssr.expected.md
index bd30bd8bc..31bf4eb00 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*2 #text/1--> <!>0<!--M_*2 #text/2--></button><!--M_*2 #button/0--><button>0<!--M_*3 #text/1--> <!>0<!--M_*3 #text/2--></button><!--M_*3 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.d={clickCount:0,"#childScope/0":_.a={},"#childScope/1":_.b={}},_.a,_.b],_.a.onClick=_._["__tests__/template.marko_0/onClick"](_.d),_.b.onClick=_._["__tests__/template.marko_0/onClick2"](_.d),_.c),"__tests__/tags/my-button.marko_0_onClick",2,3];M._.w()</script>
+  <button>0<!--M_*2 #text/1--> <!>0<!--M_*2 #text/2--></button><!--M_*2 #button/0--><button>0<!--M_*3 #text/1--> <!>0<!--M_*3 #text/2--></button><!--M_*3 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.d={clickCount:0,"#childScope/0":_.a={},"#childScope/1":_.b={}},_.a,_.b],_.a.onClick=_._["__tests__/template.marko_0/onClick"](_.d),_.b.onClick=_._["__tests__/template.marko_0/onClick2"](_.d),_.c),"__tests__/tags/my-button.marko_0_onClick 2 3"];M._.w()</script>
 ```
 
 # Render End
@@ -37,8 +37,7 @@
           ](_.d), _.b.onClick = _._[
           "__tests__/template.marko_0/onClick2"
           ](_.d), _.c),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2, 3
+        "__tests__/tags/my-button.marko_0_onClick 2 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/resume.expected.md
index b7c00b546..2fb9e92d1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/resume.expected.md
@@ -20,8 +20,7 @@
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
@@ -55,8 +54,7 @@ container.querySelector("button").click();
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
@@ -95,8 +93,7 @@ container.querySelector("button").click();
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/ssr.expected.md
index fbf5e96a6..cf164c071 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*2 #text/1--> <!>0<!--M_*2 #text/2--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={clickCount:0,"#childScope/0":_.a={}},_.a],_.a.onClick=_._["__tests__/template.marko_0/onClick"](_.c),_.b),"__tests__/tags/my-button.marko_0_onClick",2];M._.w()</script>
+  <button>0<!--M_*2 #text/1--> <!>0<!--M_*2 #text/2--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={clickCount:0,"#childScope/0":_.a={}},_.a],_.a.onClick=_._["__tests__/template.marko_0/onClick"](_.c),_.b),"__tests__/tags/my-button.marko_0_onClick 2"];M._.w()</script>
 ```
 
 # Render End
@@ -25,8 +25,7 @@
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/resume.expected.md
index 58431490e..605336c5b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/resume.expected.md
@@ -16,8 +16,7 @@
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
@@ -47,8 +46,7 @@ container.querySelector("button").click();
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
@@ -82,8 +80,7 @@ container.querySelector("button").click();
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/ssr.expected.md
index c50225c77..0840d3b8f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={clickCount:0,"#childScope/0":_.a={}},_.a],_.a.onClick=_._["__tests__/template.marko_0/onClick"](_.c),_.b),"__tests__/tags/my-button.marko_0_onClick",2];M._.w()</script>
+  <button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={clickCount:0,"#childScope/0":_.a={}},_.a],_.a.onClick=_._["__tests__/template.marko_0/onClick"](_.c),_.b),"__tests__/tags/my-button.marko_0_onClick 2"];M._.w()</script>
 ```
 
 # Render End
@@ -21,8 +21,7 @@
         }, _.a], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.c), _.b),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md
index 43a52a89e..8d38a2de8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md
@@ -20,8 +20,7 @@
         }], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.b), (_.d).add(_.e), _.c),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
@@ -55,8 +54,7 @@ container.querySelector("button").click();
         }], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.b), (_.d).add(_.e), _.c),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
@@ -94,8 +92,7 @@ container.querySelector("button").click();
         }], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.b), (_.d).add(_.e), _.c),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
@@ -133,8 +130,7 @@ container.querySelector("button").click();
         }], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.b), (_.d).add(_.e), _.c),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md
index 6cb310b0c..38778f326 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*3 #text/0--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.b={clickCount:0,"ClosureScopes:clickCount":_.d=new Set,"#childScope/0":_.a={}},_.a,_.e={_:_.b,"ClosureSignalIndex:clickCount":0}],_.a.onClick=_._["__tests__/template.marko_0/onClick"](_.b),(_.d).add(_.e),_.c),"__tests__/tags/my-button.marko_0_onClick",2];M._.w()</script>
+  <button>0<!--M_*3 #text/0--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.b={clickCount:0,"ClosureScopes:clickCount":_.d=new Set,"#childScope/0":_.a={}},_.a,_.e={_:_.b,"ClosureSignalIndex:clickCount":0}],_.a.onClick=_._["__tests__/template.marko_0/onClick"](_.b),(_.d).add(_.e),_.c),"__tests__/tags/my-button.marko_0_onClick 2"];M._.w()</script>
 ```
 
 # Render End
@@ -25,8 +25,7 @@
         }], _.a.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.b), (_.d).add(_.e), _.c),
-        "__tests__/tags/my-button.marko_0_onClick",
-        2
+        "__tests__/tags/my-button.marko_0_onClick 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/resume.expected.md
index 8bb84b271..49597ba33 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/resume.expected.md
@@ -16,8 +16,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/tags/counter.marko_0_clickCount",
-        2
+        "__tests__/tags/counter.marko_0_clickCount 2"
       ];
       M._.w()
     </script>
@@ -47,8 +46,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/tags/counter.marko_0_clickCount",
-        2
+        "__tests__/tags/counter.marko_0_clickCount 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/ssr.expected.md
index 05ddbcec3..9ee4092ee 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,1,{clickCount:0}]),"__tests__/tags/counter.marko_0_clickCount",2];M._.w()</script>
+  <div><button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,1,{clickCount:0}]),"__tests__/tags/counter.marko_0_clickCount 2"];M._.w()</script>
 ```
 
 # Render End
@@ -21,8 +21,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/tags/counter.marko_0_clickCount",
-        2
+        "__tests__/tags/counter.marko_0_clickCount 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/resume.expected.md
index bad0ae59b..39b8da43d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/resume.expected.md
@@ -26,10 +26,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -73,10 +70,7 @@ container.querySelector("button.inc").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -115,10 +109,7 @@ container.querySelector("button.toggle").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -164,10 +155,7 @@ container.querySelector("button.inc").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -202,10 +190,7 @@ container.querySelector("button.toggle").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -246,10 +231,7 @@ container.querySelector("button.inc").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/ssr.expected.md
index caaba7c01..729035dec 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=inc></button><!--M_*1 #button/0--><button class=toggle></button><!--M_*1 #button/1--><!--M_[-->The count is <!>0<!--M_*2 #text/0--><!--M_]1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={show:!0,count:0},{_:_.a}]),"__tests__/template.marko_0_show",1,"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button class=inc></button><!--M_*1 #button/0--><button class=toggle></button><!--M_*1 #button/1--><!--M_[-->The count is <!>0<!--M_*2 #text/0--><!--M_]1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={show:!0,count:0},{_:_.a}]),"__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -31,10 +31,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/resume.expected.md
index f9b4f9737..4c2faa451 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/resume.expected.md
@@ -25,10 +25,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -67,10 +64,7 @@ container.querySelector("button.inc").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -109,10 +103,7 @@ container.querySelector("button.toggle").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -153,10 +144,7 @@ container.querySelector("button.inc").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -193,10 +181,7 @@ container.querySelector("button.toggle").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -239,10 +224,7 @@ container.querySelector("button.inc").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/ssr.expected.md
index c5dde7c69..79fe2b212 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=inc></button><!--M_*1 #button/0--><button class=toggle></button><!--M_*1 #button/1--><span>0<!--M_*2 #text/0--></span><!--M_|1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={show:!0,count:0},{_:_.a}]),"__tests__/template.marko_0_show",1,"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button class=inc></button><!--M_*1 #button/0--><button class=toggle></button><!--M_*1 #button/1--><span>0<!--M_*2 #text/0--></span><!--M_|1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={show:!0,count:0},{_:_.a}]),"__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -30,10 +30,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_show 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/resume.expected.md
index eccb173c5..006c0f7df 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/resume.expected.md
@@ -15,8 +15,7 @@
         }], _.a.increment = _._[
           "__tests__/template.marko_0/increment"
           ](_.a), _.b),
-        "__tests__/template.marko_0_increment",
-        1
+        "__tests__/template.marko_0_increment 1"
       ];
       M._.w()
     </script>
@@ -45,8 +44,7 @@ container.querySelector("button").click();
         }], _.a.increment = _._[
           "__tests__/template.marko_0/increment"
           ](_.a), _.b),
-        "__tests__/template.marko_0_increment",
-        1
+        "__tests__/template.marko_0_increment 1"
       ];
       M._.w()
     </script>
@@ -79,8 +77,7 @@ container.querySelector("button").click();
         }], _.a.increment = _._[
           "__tests__/template.marko_0/increment"
           ](_.a), _.b),
-        "__tests__/template.marko_0_increment",
-        1
+        "__tests__/template.marko_0_increment 1"
       ];
       M._.w()
     </script>
@@ -113,8 +110,7 @@ container.querySelector("button").click();
         }], _.a.increment = _._[
           "__tests__/template.marko_0/increment"
           ](_.a), _.b),
-        "__tests__/template.marko_0_increment",
-        1
+        "__tests__/template.marko_0_increment 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/ssr.expected.md
index 8c1be30ab..bfff14af9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={clickCount:0}],_.a.increment=_._["__tests__/template.marko_0/increment"](_.a),_.b),"__tests__/template.marko_0_increment",1];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={clickCount:0}],_.a.increment=_._["__tests__/template.marko_0/increment"](_.a),_.b),"__tests__/template.marko_0_increment 1"];M._.w()</script>
 ```
 
 # Render End
@@ -20,8 +20,7 @@
         }], _.a.increment = _._[
           "__tests__/template.marko_0/increment"
           ](_.a), _.b),
-        "__tests__/template.marko_0_increment",
-        1
+        "__tests__/template.marko_0_increment 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/resume.expected.md
index f132f75df..12210cf67 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/resume.expected.md
@@ -30,10 +30,7 @@
           count: 0,
           multiplier: 1
         }]),
-        "__tests__/template.marko_0_count",
-        1,
-        "__tests__/template.marko_0_multiplier",
-        1
+        "__tests__/template.marko_0_count 1 __tests__/template.marko_0_multiplier 1"
       ];
       M._.w()
     </script>
@@ -77,10 +74,7 @@ container.querySelector("button#count").click();
           count: 0,
           multiplier: 1
         }]),
-        "__tests__/template.marko_0_count",
-        1,
-        "__tests__/template.marko_0_multiplier",
-        1
+        "__tests__/template.marko_0_count 1 __tests__/template.marko_0_multiplier 1"
       ];
       M._.w()
     </script>
@@ -128,10 +122,7 @@ container.querySelector("button#count").click();
           count: 0,
           multiplier: 1
         }]),
-        "__tests__/template.marko_0_count",
-        1,
-        "__tests__/template.marko_0_multiplier",
-        1
+        "__tests__/template.marko_0_count 1 __tests__/template.marko_0_multiplier 1"
       ];
       M._.w()
     </script>
@@ -179,10 +170,7 @@ container.querySelector("button#multiplier").click();
           count: 0,
           multiplier: 1
         }]),
-        "__tests__/template.marko_0_count",
-        1,
-        "__tests__/template.marko_0_multiplier",
-        1
+        "__tests__/template.marko_0_count 1 __tests__/template.marko_0_multiplier 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/ssr.expected.md
index 939ed241d..215e1bb9e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button id=multiplier>increase multiplier (<!>1<!--M_*1 #text/1-->)</button><!--M_*1 #button/0--><button id=count>increase count</button><!--M_*1 #button/2--><div>0<!--M_*1 #text/3--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0,multiplier:1}]),"__tests__/template.marko_0_count",1,"__tests__/template.marko_0_multiplier",1];M._.w()</script>
+  <button id=multiplier>increase multiplier (<!>1<!--M_*1 #text/1-->)</button><!--M_*1 #button/0--><button id=count>increase count</button><!--M_*1 #button/2--><div>0<!--M_*1 #text/3--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0,multiplier:1}]),"__tests__/template.marko_0_count 1 __tests__/template.marko_0_multiplier 1"];M._.w()</script>
 ```
 
 # Render End
@@ -35,10 +35,7 @@
           count: 0,
           multiplier: 1
         }]),
-        "__tests__/template.marko_0_count",
-        1,
-        "__tests__/template.marko_0_multiplier",
-        1
+        "__tests__/template.marko_0_count 1 __tests__/template.marko_0_multiplier 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/resume.expected.md
index b3bb9be36..c253991db 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/resume.expected.md
@@ -16,8 +16,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -47,8 +46,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -82,8 +80,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -117,8 +114,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/ssr.expected.md
index 98222bb80..cd6820483 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{clickCount:0}]),"__tests__/template.marko_0_clickCount",1];M._.w()</script>
+  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{clickCount:0}]),"__tests__/template.marko_0_clickCount 1"];M._.w()</script>
 ```
 
 # Render End
@@ -21,8 +21,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/resume.expected.md
index f3608df8a..0e23d026a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/resume.expected.md
@@ -5,8 +5,7 @@
     <script>
       WALKER_RUNTIME("M")("_");
       M._.r = [
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/ssr.expected.md
index 24f5c998e..8f1c94316 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <script>WALKER_RUNTIME("M")("_");M._.r=["__tests__/template.marko_0",1];M._.w()</script>
+  <script>WALKER_RUNTIME("M")("_");M._.r=["__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -10,8 +10,7 @@
     <script>
       WALKER_RUNTIME("M")("_");
       M._.r = [
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/resume.expected.md
index afb3fe98f..36fcf4a68 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/resume.expected.md
@@ -18,8 +18,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -50,8 +49,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/ssr.expected.md
index a2733a489..0361e431c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>hide</button><!--M_*1 #button/0-->hi<!--M_*2 #text/0--><!--M_|1 #text/1 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={message_text:"hi"},{_:_.a}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <button>hide</button><!--M_*1 #button/0-->hi<!--M_*2 #text/0--><!--M_|1 #text/1 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={message_text:"hi"},{_:_.a}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -23,8 +23,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/resume.expected.md
index cb9342b87..c8295fd8d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/resume.expected.md
@@ -14,8 +14,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -43,8 +42,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -76,8 +74,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -109,8 +106,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/ssr.expected.md
index 54dd49ee7..676a16d7e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -19,8 +19,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/resume.expected.md
index 8308ff810..75eb8b3ef 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/resume.expected.md
@@ -15,8 +15,7 @@
           a: [0],
           b: 1
         }]),
-        "__tests__/template.marko_0_a_b",
-        1
+        "__tests__/template.marko_0_a_b 1"
       ];
       M._.w()
     </script>
@@ -45,8 +44,7 @@ container.querySelector("button").click();
           a: [0],
           b: 1
         }]),
-        "__tests__/template.marko_0_a_b",
-        1
+        "__tests__/template.marko_0_a_b 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/ssr.expected.md
index 565f75921..b1b9b284c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{a:[0],b:1}]),"__tests__/template.marko_0_a_b",1];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{a:[0],b:1}]),"__tests__/template.marko_0_a_b 1"];M._.w()</script>
 ```
 
 # Render End
@@ -20,8 +20,7 @@
           a: [0],
           b: 1
         }]),
-        "__tests__/template.marko_0_a_b",
-        1
+        "__tests__/template.marko_0_a_b 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/resume.expected.md
index 4cc86ed29..e1c0cba45 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/resume.expected.md
@@ -12,8 +12,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -39,8 +38,7 @@ container.querySelector("button").click();
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/ssr.expected.md
index acbcffc01..7f9808f08 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -17,8 +17,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/resume.expected.md
index 18558c3df..4cccfcdf9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/resume.expected.md
@@ -59,8 +59,7 @@
         {
           open: !0
         }]),
-        "__tests__/tags/comments.marko_1_open",
-        6, 3, 7
+        "__tests__/tags/comments.marko_1_open 6 3 7"
       ];
       M._.w()
     </script>
@@ -133,8 +132,7 @@ container.querySelector(`#c-${id} > button`).click();
         {
           open: !0
         }]),
-        "__tests__/tags/comments.marko_1_open",
-        6, 3, 7
+        "__tests__/tags/comments.marko_1_open 6 3 7"
       ];
       M._.w()
     </script>
@@ -211,8 +209,7 @@ container.querySelector(`#c-${id} > button`).click();
         {
           open: !0
         }]),
-        "__tests__/tags/comments.marko_1_open",
-        6, 3, 7
+        "__tests__/tags/comments.marko_1_open 6 3 7"
       ];
       M._.w()
     </script>
@@ -290,8 +287,7 @@ container.querySelector(`#c-${id} > button`).click();
         {
           open: !0
         }]),
-        "__tests__/tags/comments.marko_1_open",
-        6, 3, 7
+        "__tests__/tags/comments.marko_1_open 6 3 7"
       ];
       M._.w()
     </script>
@@ -370,8 +366,7 @@ container.querySelector(`#c-${id} > button`).click();
         {
           open: !0
         }]),
-        "__tests__/tags/comments.marko_1_open",
-        6, 3, 7
+        "__tests__/tags/comments.marko_1_open 6 3 7"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/ssr.expected.md
index a703e2817..a1ce15e93 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <ul><li id=c-0><span>Hello World</span><button>[-]<!--M_*3 #text/3--></button><!--M_*3 #button/2--><ul><li id=c-0-0><span>testing 123</span><button>[-]<!--M_*6 #text/3--></button><!--M_*6 #button/2--></li><!--M_*6 #li/0--></ul></li><!--M_*3 #li/0--><li id=c-1><span>Goodbye World</span><button>[-]<!--M_*7 #text/3--></button><!--M_*7 #button/2--></li><!--M_*7 #li/0--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,2,{open:!0},2,{open:!0},{open:!0}]),"__tests__/tags/comments.marko_1_open",6,3,7];M._.w()</script>
+  <ul><li id=c-0><span>Hello World</span><button>[-]<!--M_*3 #text/3--></button><!--M_*3 #button/2--><ul><li id=c-0-0><span>testing 123</span><button>[-]<!--M_*6 #text/3--></button><!--M_*6 #button/2--></li><!--M_*6 #li/0--></ul></li><!--M_*3 #li/0--><li id=c-1><span>Goodbye World</span><button>[-]<!--M_*7 #text/3--></button><!--M_*7 #button/2--></li><!--M_*7 #li/0--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,2,{open:!0},2,{open:!0},{open:!0}]),"__tests__/tags/comments.marko_1_open 6 3 7"];M._.w()</script>
 ```
 
 # Render End
@@ -63,8 +63,7 @@
         {
           open: !0
         }]),
-        "__tests__/tags/comments.marko_1_open",
-        6, 3, 7
+        "__tests__/tags/comments.marko_1_open 6 3 7"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-computed/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-computed/__snapshots__/resume.expected.md
index 8db350680..7b4a8bf63 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-computed/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-computed/__snapshots__/resume.expected.md
@@ -22,8 +22,7 @@
           items: ["a", "b", "c"],
           index: 0
         }]),
-        "__tests__/template.marko_0_items_index",
-        1
+        "__tests__/template.marko_0_items_index 1"
       ];
       M._.w()
     </script>
@@ -59,8 +58,7 @@ container.querySelector("button").click();
           items: ["a", "b", "c"],
           index: 0
         }]),
-        "__tests__/template.marko_0_items_index",
-        1
+        "__tests__/template.marko_0_items_index 1"
       ];
       M._.w()
     </script>
@@ -101,8 +99,7 @@ container.querySelector("button").click();
           items: ["a", "b", "c"],
           index: 0
         }]),
-        "__tests__/template.marko_0_items_index",
-        1
+        "__tests__/template.marko_0_items_index 1"
       ];
       M._.w()
     </script>
@@ -142,8 +139,7 @@ container.querySelector("button").click();
           items: ["a", "b", "c"],
           index: 0
         }]),
-        "__tests__/template.marko_0_items_index",
-        1
+        "__tests__/template.marko_0_items_index 1"
       ];
       M._.w()
     </script>
@@ -184,8 +180,7 @@ container.querySelector("button").click();
           items: ["a", "b", "c"],
           index: 0
         }]),
-        "__tests__/template.marko_0_items_index",
-        1
+        "__tests__/template.marko_0_items_index 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-computed/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-computed/__snapshots__/ssr.expected.md
index b756378cd..77274adb0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-computed/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-computed/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>a<!--M_*1 #text/0--></div><div>a<!--M_*1 #text/1--></div><button>Update</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{items:["a","b","c"],index:0}]),"__tests__/template.marko_0_items_index",1];M._.w()</script>
+  <div>a<!--M_*1 #text/0--></div><div>a<!--M_*1 #text/1--></div><button>Update</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{items:["a","b","c"],index:0}]),"__tests__/template.marko_0_items_index 1"];M._.w()</script>
 ```
 
 # Render End
@@ -27,8 +27,7 @@
           items: ["a", "b", "c"],
           index: 0
         }]),
-        "__tests__/template.marko_0_items_index",
-        1
+        "__tests__/template.marko_0_items_index 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-optional/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-optional/__snapshots__/resume.expected.md
index 59389b89b..791dfc1df 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-optional/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-optional/__snapshots__/resume.expected.md
@@ -21,8 +21,7 @@
         {
           index: -1
         }]),
-        "__tests__/template.marko_0_index",
-        1
+        "__tests__/template.marko_0_index 1"
       ];
       M._.w()
     </script>
@@ -57,8 +56,7 @@ container.querySelector("button").click();
         {
           index: -1
         }]),
-        "__tests__/template.marko_0_index",
-        1
+        "__tests__/template.marko_0_index 1"
       ];
       M._.w()
     </script>
@@ -98,8 +96,7 @@ container.querySelector("button").click();
         {
           index: -1
         }]),
-        "__tests__/template.marko_0_index",
-        1
+        "__tests__/template.marko_0_index 1"
       ];
       M._.w()
     </script>
@@ -139,8 +136,7 @@ container.querySelector("button").click();
         {
           index: -1
         }]),
-        "__tests__/template.marko_0_index",
-        1
+        "__tests__/template.marko_0_index 1"
       ];
       M._.w()
     </script>
@@ -180,8 +176,7 @@ container.querySelector("button").click();
         {
           index: -1
         }]),
-        "__tests__/template.marko_0_index",
-        1
+        "__tests__/template.marko_0_index 1"
       ];
       M._.w()
     </script>
@@ -221,8 +216,7 @@ container.querySelector("button").click();
         {
           index: -1
         }]),
-        "__tests__/template.marko_0_index",
-        1
+        "__tests__/template.marko_0_index 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-optional/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-optional/__snapshots__/ssr.expected.md
index 934b6eb79..876230627 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-optional/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-optional/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>&zwj;<!--M_*1 #text/0--></div><div>&zwj;<!--M_*1 #text/1--></div><button>Update</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{index:-1}]),"__tests__/template.marko_0_index",1];M._.w()</script>
+  <div>&zwj;<!--M_*1 #text/0--></div><div>&zwj;<!--M_*1 #text/1--></div><button>Update</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{index:-1}]),"__tests__/template.marko_0_index 1"];M._.w()</script>
 ```
 
 # Render End
@@ -26,8 +26,7 @@
         {
           index: -1
         }]),
-        "__tests__/template.marko_0_index",
-        1
+        "__tests__/template.marko_0_index 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-merge-member-expression/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-merge-member-expression/__snapshots__/resume.expected.md
index 766f65051..98fd995bb 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-merge-member-expression/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-merge-member-expression/__snapshots__/resume.expected.md
@@ -15,8 +15,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -49,8 +48,7 @@ container.querySelector("button").click();
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-merge-member-expression/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-merge-member-expression/__snapshots__/ssr.expected.md
index 1c6251b67..bef464204 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-merge-member-expression/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-merge-member-expression/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><div></div><!--M_*1 #div/1--><button>Click</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><div></div><!--M_*1 #div/1--><button>Click</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -20,8 +20,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/resume.expected.md
index a88f0ba25..4154ab262 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/resume.expected.md
@@ -55,8 +55,7 @@
           _: _.e,
           "#childScope/0": _.g = {}
         }, _.g]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -147,8 +146,7 @@ container.querySelector("button").click();
           _: _.e,
           "#childScope/0": _.g = {}
         }, _.g]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/ssr.expected.md
index 8ac07ba4f..d31a75188 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Push</button><!--M_*1 #button/0--><!--M_[--><div>0.0<!--M_*4 #text/0--></div><div>0.1<!--M_*6 #text/0--></div><!--M_|2 #text/0 5 3--><!--M_[2--><div>1.0<!--M_*9 #text/0--></div><div>1.1<!--M_*11 #text/0--></div><!--M_|7 #text/0 10 8--><!--M_]1 #text/1 7--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.h=[0,_.a={items:[0,1]},_.b={outer:0,_:_.a},{_:_.b,"#childScope/0":_.c={}},_.c,{_:_.b,"#childScope/0":_.d={}},_.d,_.e={outer:1,_:_.a},{_:_.e,"#childScope/0":_.f={}},_.f,{_:_.e,"#childScope/0":_.g={}},_.g]),"__tests__/template.marko_0_items",1];M._.w()</script>
+  <button>Push</button><!--M_*1 #button/0--><!--M_[--><div>0.0<!--M_*4 #text/0--></div><div>0.1<!--M_*6 #text/0--></div><!--M_|2 #text/0 5 3--><!--M_[2--><div>1.0<!--M_*9 #text/0--></div><div>1.1<!--M_*11 #text/0--></div><!--M_|7 #text/0 10 8--><!--M_]1 #text/1 7--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.h=[0,_.a={items:[0,1]},_.b={outer:0,_:_.a},{_:_.b,"#childScope/0":_.c={}},_.c,{_:_.b,"#childScope/0":_.d={}},_.d,_.e={outer:1,_:_.a},{_:_.e,"#childScope/0":_.f={}},_.f,{_:_.e,"#childScope/0":_.g={}},_.g]),"__tests__/template.marko_0_items 1"];M._.w()</script>
 ```
 
 # Render End
@@ -60,8 +60,7 @@
           _: _.e,
           "#childScope/0": _.g = {}
         }, _.g]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/resume.expected.md
index 397a90712..cc76e5f82 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/resume.expected.md
@@ -37,8 +37,7 @@
         }], _.a.content = _._[
           "__tests__/template.marko_1_content"
           ](_.b), (_.e).add(_.f), _.d),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -93,8 +92,7 @@ container.querySelector("button").click();
         }], _.a.content = _._[
           "__tests__/template.marko_1_content"
           ](_.b), (_.e).add(_.f), _.d),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -149,8 +147,7 @@ container.querySelector("button").click();
         }], _.a.content = _._[
           "__tests__/template.marko_1_content"
           ](_.b), (_.e).add(_.f), _.d),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -205,8 +202,7 @@ container.querySelector("button").click();
         }], _.a.content = _._[
           "__tests__/template.marko_1_content"
           ](_.b), (_.e).add(_.f), _.d),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/ssr.expected.md
index 4dcc40617..a2137d403 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Inc</button><!--M_*1 #button/0--><div><!--M_[--><div><div>1<!--M_*5 #text/0-->.2</div></div><!--M_]2 #text/0 3--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.b={x:1,y:2,"#childScope/1":_.a={"ConditionalRenderer:#text/0":"__tests__/template.marko_1_content"}},_.a,_.c={outer:1,_:_.b,"ClosureScopes:outer":_.e=new Set},1,_.f={_:_.c,"ClosureSignalIndex:outer":0,"#ClosestBranchId":3}],_.a.content=_._["__tests__/template.marko_1_content"](_.b),(_.e).add(_.f),_.d),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <button>Inc</button><!--M_*1 #button/0--><div><!--M_[--><div><div>1<!--M_*5 #text/0-->.2</div></div><!--M_]2 #text/0 3--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.b={x:1,y:2,"#childScope/1":_.a={"ConditionalRenderer:#text/0":"__tests__/template.marko_1_content"}},_.a,_.c={outer:1,_:_.b,"ClosureScopes:outer":_.e=new Set},1,_.f={_:_.c,"ClosureSignalIndex:outer":0,"#ClosestBranchId":3}],_.a.content=_._["__tests__/template.marko_1_content"](_.b),(_.e).add(_.f),_.d),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -42,8 +42,7 @@
         }], _.a.content = _._[
           "__tests__/template.marko_1_content"
           ](_.b), (_.e).add(_.f), _.d),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/resume.expected.md
index e79c0d5aa..6f16897b4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/resume.expected.md
@@ -17,8 +17,7 @@
           _: _.a,
           "ClosureSignalIndex:count": 0
         }], (_.c).add(_.d), _.b),
-        "__tests__/template.marko_1_count",
-        3
+        "__tests__/template.marko_1_count 3"
       ];
       M._.w()
     </script>
@@ -49,8 +48,7 @@ container.querySelector("button").click();
           _: _.a,
           "ClosureSignalIndex:count": 0
         }], (_.c).add(_.d), _.b),
-        "__tests__/template.marko_1_count",
-        3
+        "__tests__/template.marko_1_count 3"
       ];
       M._.w()
     </script>
@@ -85,8 +83,7 @@ container.querySelector("button").click();
           _: _.a,
           "ClosureSignalIndex:count": 0
         }], (_.c).add(_.d), _.b),
-        "__tests__/template.marko_1_count",
-        3
+        "__tests__/template.marko_1_count 3"
       ];
       M._.w()
     </script>
@@ -121,8 +118,7 @@ container.querySelector("button").click();
           _: _.a,
           "ClosureSignalIndex:count": 0
         }], (_.c).add(_.d), _.b),
-        "__tests__/template.marko_1_count",
-        3
+        "__tests__/template.marko_1_count 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/ssr.expected.md
index 761966068..6f5f14214 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={count:0,"ClosureScopes:count":_.c=new Set},1,_.d={_:_.a,"ClosureSignalIndex:count":0}],(_.c).add(_.d),_.b),"__tests__/template.marko_1_count",3];M._.w()</script>
+  <button>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={count:0,"ClosureScopes:count":_.c=new Set},1,_.d={_:_.a,"ClosureSignalIndex:count":0}],(_.c).add(_.d),_.b),"__tests__/template.marko_1_count 3"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
           _: _.a,
           "ClosureSignalIndex:count": 0
         }], (_.c).add(_.d), _.b),
-        "__tests__/template.marko_1_count",
-        3
+        "__tests__/template.marko_1_count 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md
index e79c0d5aa..6f16897b4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md
@@ -17,8 +17,7 @@
           _: _.a,
           "ClosureSignalIndex:count": 0
         }], (_.c).add(_.d), _.b),
-        "__tests__/template.marko_1_count",
-        3
+        "__tests__/template.marko_1_count 3"
       ];
       M._.w()
     </script>
@@ -49,8 +48,7 @@ container.querySelector("button").click();
           _: _.a,
           "ClosureSignalIndex:count": 0
         }], (_.c).add(_.d), _.b),
-        "__tests__/template.marko_1_count",
-        3
+        "__tests__/template.marko_1_count 3"
       ];
       M._.w()
     </script>
@@ -85,8 +83,7 @@ container.querySelector("button").click();
           _: _.a,
           "ClosureSignalIndex:count": 0
         }], (_.c).add(_.d), _.b),
-        "__tests__/template.marko_1_count",
-        3
+        "__tests__/template.marko_1_count 3"
       ];
       M._.w()
     </script>
@@ -121,8 +118,7 @@ container.querySelector("button").click();
           _: _.a,
           "ClosureSignalIndex:count": 0
         }], (_.c).add(_.d), _.b),
-        "__tests__/template.marko_1_count",
-        3
+        "__tests__/template.marko_1_count 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md
index 761966068..6f5f14214 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={count:0,"ClosureScopes:count":_.c=new Set},1,_.d={_:_.a,"ClosureSignalIndex:count":0}],(_.c).add(_.d),_.b),"__tests__/template.marko_1_count",3];M._.w()</script>
+  <button>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={count:0,"ClosureScopes:count":_.c=new Set},1,_.d={_:_.a,"ClosureSignalIndex:count":0}],(_.c).add(_.d),_.b),"__tests__/template.marko_1_count 3"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
           _: _.a,
           "ClosureSignalIndex:count": 0
         }], (_.c).add(_.d), _.b),
-        "__tests__/template.marko_1_count",
-        3
+        "__tests__/template.marko_1_count 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/resume.expected.md
index c8b12e4c9..f9e1ffe2b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/resume.expected.md
@@ -82,8 +82,7 @@
           }, _.b, _.c, _.d, _.e, _.f, _.g, _.h, _.i, _.j, _.k, _.l, _.m], _.b
           ._ = _.c._ = _.d._ = _.e._ = _.f._ = _.g._ = _.h._ = _.i._ = _.j._ =
           _.k._ = _.l._ = _.m._ = _.a, _.n),
-        "__tests__/template.marko_1_num",
-        2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
+        "__tests__/template.marko_1_num 2 3 4 5 6 7 8 9 10 11 12 13"
       ];
       M._.w()
     </script>
@@ -192,8 +191,7 @@ click(c, 2);
           }, _.b, _.c, _.d, _.e, _.f, _.g, _.h, _.i, _.j, _.k, _.l, _.m], _.b
           ._ = _.c._ = _.d._ = _.e._ = _.f._ = _.g._ = _.h._ = _.i._ = _.j._ =
           _.k._ = _.l._ = _.m._ = _.a, _.n),
-        "__tests__/template.marko_1_num",
-        2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
+        "__tests__/template.marko_1_num 2 3 4 5 6 7 8 9 10 11 12 13"
       ];
       M._.w()
     </script>
@@ -308,8 +306,7 @@ click(c, 3);
           }, _.b, _.c, _.d, _.e, _.f, _.g, _.h, _.i, _.j, _.k, _.l, _.m], _.b
           ._ = _.c._ = _.d._ = _.e._ = _.f._ = _.g._ = _.h._ = _.i._ = _.j._ =
           _.k._ = _.l._ = _.m._ = _.a, _.n),
-        "__tests__/template.marko_1_num",
-        2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
+        "__tests__/template.marko_1_num 2 3 4 5 6 7 8 9 10 11 12 13"
       ];
       M._.w()
     </script>
@@ -421,8 +418,7 @@ click(c, 5);
           }, _.b, _.c, _.d, _.e, _.f, _.g, _.h, _.i, _.j, _.k, _.l, _.m], _.b
           ._ = _.c._ = _.d._ = _.e._ = _.f._ = _.g._ = _.h._ = _.i._ = _.j._ =
           _.k._ = _.l._ = _.m._ = _.a, _.n),
-        "__tests__/template.marko_1_num",
-        2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
+        "__tests__/template.marko_1_num 2 3 4 5 6 7 8 9 10 11 12 13"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/ssr.expected.md
index c61ebb308..21b0dd4a8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>1</button><!--M_*2 #button/0--><button>2</button><!--M_*3 #button/0--><button>3</button><!--M_*4 #button/0--><button>4</button><!--M_*5 #button/0--><button>5</button><!--M_*6 #button/0--><button>6</button><!--M_*7 #button/0--><button>7</button><!--M_*8 #button/0--><button>8</button><!--M_*9 #button/0--><button>9</button><!--M_*10 #button/0--><button>10</button><!--M_*11 #button/0--><button>11</button><!--M_*12 #button/0--><button>12</button><!--M_*13 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.n=[0,_.a={"BranchScopes:#text/0":[_.b={num:1},_.c={num:2},_.d={num:3},_.e={num:4},_.f={num:5},_.g={num:6},_.h={num:7},_.i={num:8},_.j={num:9},_.k={num:10},_.l={num:11},_.m={num:12}]},_.b,_.c,_.d,_.e,_.f,_.g,_.h,_.i,_.j,_.k,_.l,_.m],_.b._=_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.a,_.n),"__tests__/template.marko_1_num",2,3,4,5,6,7,8,9,10,11,12,13];M._.w()</script>
+  <button>1</button><!--M_*2 #button/0--><button>2</button><!--M_*3 #button/0--><button>3</button><!--M_*4 #button/0--><button>4</button><!--M_*5 #button/0--><button>5</button><!--M_*6 #button/0--><button>6</button><!--M_*7 #button/0--><button>7</button><!--M_*8 #button/0--><button>8</button><!--M_*9 #button/0--><button>9</button><!--M_*10 #button/0--><button>10</button><!--M_*11 #button/0--><button>11</button><!--M_*12 #button/0--><button>12</button><!--M_*13 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.n=[0,_.a={"BranchScopes:#text/0":[_.b={num:1},_.c={num:2},_.d={num:3},_.e={num:4},_.f={num:5},_.g={num:6},_.h={num:7},_.i={num:8},_.j={num:9},_.k={num:10},_.l={num:11},_.m={num:12}]},_.b,_.c,_.d,_.e,_.f,_.g,_.h,_.i,_.j,_.k,_.l,_.m],_.b._=_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.a,_.n),"__tests__/template.marko_1_num 2 3 4 5 6 7 8 9 10 11 12 13"];M._.w()</script>
 ```
 
 # Render End
@@ -87,8 +87,7 @@
           }, _.b, _.c, _.d, _.e, _.f, _.g, _.h, _.i, _.j, _.k, _.l, _.m], _.b
           ._ = _.c._ = _.d._ = _.e._ = _.f._ = _.g._ = _.h._ = _.i._ = _.j._ =
           _.k._ = _.l._ = _.m._ = _.a, _.n),
-        "__tests__/template.marko_1_num",
-        2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
+        "__tests__/template.marko_1_num 2 3 4 5 6 7 8 9 10 11 12 13"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/resume.expected.md
index 2124378d5..c684a1e77 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1_clickCount",
-        2
+        "__tests__/template.marko_1_clickCount 2"
       ];
       M._.w()
     </script>
@@ -52,8 +51,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1_clickCount",
-        2
+        "__tests__/template.marko_1_clickCount 2"
       ];
       M._.w()
     </script>
@@ -91,8 +89,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1_clickCount",
-        2
+        "__tests__/template.marko_1_clickCount 2"
       ];
       M._.w()
     </script>
@@ -128,8 +125,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1_clickCount",
-        2
+        "__tests__/template.marko_1_clickCount 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/ssr.expected.md
index ce8be2713..a6c93b389 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_|1 #text/0 2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={clickCount:0},{_:_.a}]),"__tests__/template.marko_1_clickCount",2];M._.w()</script>
+  <div><button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_|1 #text/0 2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={clickCount:0},{_:_.a}]),"__tests__/template.marko_1_clickCount 2"];M._.w()</script>
 ```
 
 # Render End
@@ -24,8 +24,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1_clickCount",
-        2
+        "__tests__/template.marko_1_clickCount 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/resume.expected.md
index 5485f4524..65ef4339f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/resume.expected.md
@@ -25,10 +25,7 @@
           id: 0,
           items: []
         }]),
-        "__tests__/template.marko_0_items",
-        1,
-        "__tests__/template.marko_0_id_items",
-        1
+        "__tests__/template.marko_0_items 1 __tests__/template.marko_0_id_items 1"
       ];
       M._.w()
     </script>
@@ -67,10 +64,7 @@ container.querySelector("#add").click();
           id: 0,
           items: []
         }]),
-        "__tests__/template.marko_0_items",
-        1,
-        "__tests__/template.marko_0_id_items",
-        1
+        "__tests__/template.marko_0_items 1 __tests__/template.marko_0_id_items 1"
       ];
       M._.w()
     </script>
@@ -114,10 +108,7 @@ container.querySelector("#add").click();
           id: 0,
           items: []
         }]),
-        "__tests__/template.marko_0_items",
-        1,
-        "__tests__/template.marko_0_id_items",
-        1
+        "__tests__/template.marko_0_items 1 __tests__/template.marko_0_id_items 1"
       ];
       M._.w()
     </script>
@@ -160,10 +151,7 @@ container.querySelector("#remove").click();
           id: 0,
           items: []
         }]),
-        "__tests__/template.marko_0_items",
-        1,
-        "__tests__/template.marko_0_id_items",
-        1
+        "__tests__/template.marko_0_items 1 __tests__/template.marko_0_id_items 1"
       ];
       M._.w()
     </script>
@@ -206,10 +194,7 @@ container.querySelector("#add").click();
           id: 0,
           items: []
         }]),
-        "__tests__/template.marko_0_items",
-        1,
-        "__tests__/template.marko_0_id_items",
-        1
+        "__tests__/template.marko_0_items 1 __tests__/template.marko_0_id_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/ssr.expected.md
index c2a6316c3..41f73e102 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><!--M_|1 #text/0--><button id=add>Add</button><!--M_*1 #button/1--><button id=remove>Remove</button><!--M_*1 #button/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{id:0,items:[]}]),"__tests__/template.marko_0_items",1,"__tests__/template.marko_0_id_items",1];M._.w()</script>
+  <div><!--M_|1 #text/0--><button id=add>Add</button><!--M_*1 #button/1--><button id=remove>Remove</button><!--M_*1 #button/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{id:0,items:[]}]),"__tests__/template.marko_0_items 1 __tests__/template.marko_0_id_items 1"];M._.w()</script>
 ```
 
 # Render End
@@ -30,10 +30,7 @@
           id: 0,
           items: []
         }]),
-        "__tests__/template.marko_0_items",
-        1,
-        "__tests__/template.marko_0_id_items",
-        1
+        "__tests__/template.marko_0_items 1 __tests__/template.marko_0_id_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/resume.expected.md
index 669c81f51..de969cdfd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/resume.expected.md
@@ -46,10 +46,7 @@
         {
           "#LoopKey": 3
         }]),
-        "__tests__/template.marko_0_list",
-        1,
-        "__tests__/template.marko_0_open",
-        1
+        "__tests__/template.marko_0_list 1 __tests__/template.marko_0_open 1"
       ];
       M._.w()
     </script>
@@ -111,10 +108,7 @@ container.querySelector("#toggle").click();
         {
           "#LoopKey": 3
         }]),
-        "__tests__/template.marko_0_list",
-        1,
-        "__tests__/template.marko_0_open",
-        1
+        "__tests__/template.marko_0_list 1 __tests__/template.marko_0_open 1"
       ];
       M._.w()
     </script>
@@ -178,10 +172,7 @@ container.querySelector("#toggle").click();
         {
           "#LoopKey": 3
         }]),
-        "__tests__/template.marko_0_list",
-        1,
-        "__tests__/template.marko_0_open",
-        1
+        "__tests__/template.marko_0_list 1 __tests__/template.marko_0_open 1"
       ];
       M._.w()
     </script>
@@ -245,10 +236,7 @@ container.querySelector("#reverse").click();
         {
           "#LoopKey": 3
         }]),
-        "__tests__/template.marko_0_list",
-        1,
-        "__tests__/template.marko_0_open",
-        1
+        "__tests__/template.marko_0_list 1 __tests__/template.marko_0_open 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/ssr.expected.md
index 057338149..00e665b25 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <ul><li>1<!--M_*2 #text/0--></li><li>2<!--M_*3 #text/0--></li><li>3<!--M_*4 #text/0--></li><!--M_}1 #ul/0 4 3 2--></ul><button id=toggle>Toggle</button><!--M_*1 #button/1--><button id=reverse>Reverse</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{open:!0,list:[1,2,3]},{"#LoopKey":1},{"#LoopKey":2},{"#LoopKey":3}]),"__tests__/template.marko_0_list",1,"__tests__/template.marko_0_open",1];M._.w()</script>
+  <ul><li>1<!--M_*2 #text/0--></li><li>2<!--M_*3 #text/0--></li><li>3<!--M_*4 #text/0--></li><!--M_}1 #ul/0 4 3 2--></ul><button id=toggle>Toggle</button><!--M_*1 #button/1--><button id=reverse>Reverse</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{open:!0,list:[1,2,3]},{"#LoopKey":1},{"#LoopKey":2},{"#LoopKey":3}]),"__tests__/template.marko_0_list 1 __tests__/template.marko_0_open 1"];M._.w()</script>
 ```
 
 # Render End
@@ -51,10 +51,7 @@
         {
           "#LoopKey": 3
         }]),
-        "__tests__/template.marko_0_list",
-        1,
-        "__tests__/template.marko_0_open",
-        1
+        "__tests__/template.marko_0_list 1 __tests__/template.marko_0_open 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/resume.expected.md
index 573dc372e..d2943be58 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
           show: !0
         },
         {}]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -55,8 +54,7 @@ container.querySelector("button").click();
           show: !0
         },
         {}]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -95,8 +93,7 @@ container.querySelector("button").click();
           show: !0
         },
         {}]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -132,8 +129,7 @@ container.querySelector("button").click();
           show: !0
         },
         {}]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/ssr.expected.md
index e71a764ff..329c3cf7a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><!--M_[-->Hello!<!--M_]1 #text/0 2--><button>Toggle</button><!--M_*1 #button/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{show:!0},{}]),"__tests__/template.marko_0_show",1];M._.w()</script>
+  <div><!--M_[-->Hello!<!--M_]1 #text/0 2--><button>Toggle</button><!--M_*1 #button/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{show:!0},{}]),"__tests__/template.marko_0_show 1"];M._.w()</script>
 ```
 
 # Render End
@@ -24,8 +24,7 @@
           show: !0
         },
         {}]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/resume.expected.md
index b3bb9be36..c253991db 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/resume.expected.md
@@ -16,8 +16,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -47,8 +46,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -82,8 +80,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -117,8 +114,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/ssr.expected.md
index 98222bb80..cd6820483 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{clickCount:0}]),"__tests__/template.marko_0_clickCount",1];M._.w()</script>
+  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{clickCount:0}]),"__tests__/template.marko_0_clickCount 1"];M._.w()</script>
 ```
 
 # Render End
@@ -21,8 +21,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/resume.expected.md
index 39afefec2..2db5ce756 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -49,8 +48,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/ssr.expected.md
index 9ab72c16e..d46c447dc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button></button><!--M_*1 #button/0--><span>hi<!--M_*2 #text/0--></span><!--M_|1 #text/1 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={show:!0,message:"hi"},{_:_.a}]),"__tests__/template.marko_0_show",1];M._.w()</script>
+  <button></button><!--M_*1 #button/0--><span>hi<!--M_*2 #text/0--></span><!--M_|1 #text/1 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={show:!0,message:"hi"},{_:_.a}]),"__tests__/template.marko_0_show 1"];M._.w()</script>
 ```
 
 # Render End
@@ -24,8 +24,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/batched-updates/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/batched-updates/__snapshots__/resume.expected.md
index 5ca383f5a..e70da2701 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/batched-updates/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/batched-updates/__snapshots__/resume.expected.md
@@ -15,8 +15,7 @@
           a: 0,
           b: 0
         }]),
-        "__tests__/template.marko_0_a_b",
-        1
+        "__tests__/template.marko_0_a_b 1"
       ];
       M._.w()
     </script>
@@ -45,8 +44,7 @@ container.querySelector("button").click();
           a: 0,
           b: 0
         }]),
-        "__tests__/template.marko_0_a_b",
-        1
+        "__tests__/template.marko_0_a_b 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/batched-updates/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/batched-updates/__snapshots__/ssr.expected.md
index ad53f94ec..324140810 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/batched-updates/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/batched-updates/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{a:0,b:0}]),"__tests__/template.marko_0_a_b",1];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{a:0,b:0}]),"__tests__/template.marko_0_a_b 1"];M._.w()</script>
 ```
 
 # Render End
@@ -20,8 +20,7 @@
           a: 0,
           b: 0
         }]),
-        "__tests__/template.marko_0_a_b",
-        1
+        "__tests__/template.marko_0_a_b 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/bind-to-input/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/bind-to-input/__snapshots__/resume.expected.md
index ee469f1d4..e875f7b5d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/bind-to-input/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/bind-to-input/__snapshots__/resume.expected.md
@@ -38,8 +38,7 @@
         }], _.a.$countChange = _.a["TagVariableChange:x"] = _._[
           "__tests__/template.marko_0/countChange"
           ](_.b), (_.e).add(_.f), _.e.add(_.g), _.d),
-        "__tests__/tags/counter.marko_0_x",
-        2, 4
+        "__tests__/tags/counter.marko_0_x 2 4"
       ];
       M._.w()
     </script>
@@ -91,8 +90,7 @@ container.querySelector("#controlled").click();
         }], _.a.$countChange = _.a["TagVariableChange:x"] = _._[
           "__tests__/template.marko_0/countChange"
           ](_.b), (_.e).add(_.f), _.e.add(_.g), _.d),
-        "__tests__/tags/counter.marko_0_x",
-        2, 4
+        "__tests__/tags/counter.marko_0_x 2 4"
       ];
       M._.w()
     </script>
@@ -150,8 +148,7 @@ container.querySelector("#uncontrolled").click();
         }], _.a.$countChange = _.a["TagVariableChange:x"] = _._[
           "__tests__/template.marko_0/countChange"
           ](_.b), (_.e).add(_.f), _.e.add(_.g), _.d),
-        "__tests__/tags/counter.marko_0_x",
-        2, 4
+        "__tests__/tags/counter.marko_0_x 2 4"
       ];
       M._.w()
     </script>
@@ -207,8 +204,7 @@ container.querySelector("#controlled").click();
         }], _.a.$countChange = _.a["TagVariableChange:x"] = _._[
           "__tests__/template.marko_0/countChange"
           ](_.b), (_.e).add(_.f), _.e.add(_.g), _.d),
-        "__tests__/tags/counter.marko_0_x",
-        2, 4
+        "__tests__/tags/counter.marko_0_x 2 4"
       ];
       M._.w()
     </script>
@@ -266,8 +262,7 @@ container.querySelector("#uncontrolled").click();
         }], _.a.$countChange = _.a["TagVariableChange:x"] = _._[
           "__tests__/template.marko_0/countChange"
           ](_.b), (_.e).add(_.f), _.e.add(_.g), _.d),
-        "__tests__/tags/counter.marko_0_x",
-        2, 4
+        "__tests__/tags/counter.marko_0_x 2 4"
       ];
       M._.w()
     </script>
@@ -323,8 +318,7 @@ container.querySelector("#controlled").click();
         }], _.a.$countChange = _.a["TagVariableChange:x"] = _._[
           "__tests__/template.marko_0/countChange"
           ](_.b), (_.e).add(_.f), _.e.add(_.g), _.d),
-        "__tests__/tags/counter.marko_0_x",
-        2, 4
+        "__tests__/tags/counter.marko_0_x 2 4"
       ];
       M._.w()
     </script>
@@ -382,8 +376,7 @@ container.querySelector("#uncontrolled").click();
         }], _.a.$countChange = _.a["TagVariableChange:x"] = _._[
           "__tests__/template.marko_0/countChange"
           ](_.b), (_.e).add(_.f), _.e.add(_.g), _.d),
-        "__tests__/tags/counter.marko_0_x",
-        2, 4
+        "__tests__/tags/counter.marko_0_x 2 4"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/bind-to-input/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/bind-to-input/__snapshots__/ssr.expected.md
index 47dd72af8..aff913474 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/bind-to-input/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/bind-to-input/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button id=controlled data-internal=0>0<!--M_*3 #text/0--></button><!--M_*2 #button/0--><button id=uncontrolled data-internal=0>0<!--M_*5 #text/0--></button><!--M_*4 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.b={"ClosureScopes:x":_.e=new Set,"#childScope/0":_.a={x:0},"#childScope/1":_.c={x:0}},_.a,_.f={_:_.b,"ClosureSignalIndex:x":0},_.c,_.g={_:_.b,"ClosureSignalIndex:x":1}],_.a.$countChange=_.a["TagVariableChange:x"]=_._["__tests__/template.marko_0/countChange"](_.b),(_.e).add(_.f),_.e.add(_.g),_.d),"__tests__/tags/counter.marko_0_x",2,4];M._.w()</script>
+  <button id=controlled data-internal=0>0<!--M_*3 #text/0--></button><!--M_*2 #button/0--><button id=uncontrolled data-internal=0>0<!--M_*5 #text/0--></button><!--M_*4 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.b={"ClosureScopes:x":_.e=new Set,"#childScope/0":_.a={x:0},"#childScope/1":_.c={x:0}},_.a,_.f={_:_.b,"ClosureSignalIndex:x":0},_.c,_.g={_:_.b,"ClosureSignalIndex:x":1}],_.a.$countChange=_.a["TagVariableChange:x"]=_._["__tests__/template.marko_0/countChange"](_.b),(_.e).add(_.f),_.e.add(_.g),_.d),"__tests__/tags/counter.marko_0_x 2 4"];M._.w()</script>
 ```
 
 # Render End
@@ -43,8 +43,7 @@
         }], _.a.$countChange = _.a["TagVariableChange:x"] = _._[
           "__tests__/template.marko_0/countChange"
           ](_.b), (_.e).add(_.f), _.e.add(_.g), _.d),
-        "__tests__/tags/counter.marko_0_x",
-        2, 4
+        "__tests__/tags/counter.marko_0_x 2 4"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md
index ca1f2fa3c..af153a3de 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md
@@ -26,8 +26,7 @@
         }], _.a.click = _.b.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.d), (_.f).add(_.g), _.e),
-        "__tests__/tags/FancyButton.marko_0_attrs",
-        2
+        "__tests__/tags/FancyButton.marko_0_attrs 2"
       ];
       M._.w()
     </script>
@@ -71,8 +70,7 @@ container.querySelector("button").click();
         }], _.a.click = _.b.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.d), (_.f).add(_.g), _.e),
-        "__tests__/tags/FancyButton.marko_0_attrs",
-        2
+        "__tests__/tags/FancyButton.marko_0_attrs 2"
       ];
       M._.w()
     </script>
@@ -116,8 +114,7 @@ container.querySelector("button").click();
         }], _.a.click = _.b.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.d), (_.f).add(_.g), _.e),
-        "__tests__/tags/FancyButton.marko_0_attrs",
-        2
+        "__tests__/tags/FancyButton.marko_0_attrs 2"
       ];
       M._.w()
     </script>
@@ -161,8 +158,7 @@ container.querySelector("button").click();
         }], _.a.click = _.b.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.d), (_.f).add(_.g), _.e),
-        "__tests__/tags/FancyButton.marko_0_attrs",
-        2
+        "__tests__/tags/FancyButton.marko_0_attrs 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md
index 669a037fe..49a5e0e2e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button><!--M_[-->0<!--M_*3 #text/0--><!--M_]2 #text/1 3--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.e=[0,_.d={clickCount:0,"ClosureScopes:clickCount":_.f=new Set,"#childScope/0":_.c={"EventAttributes:#button/0":_.a={},"ConditionalRenderer:#text/1":"__tests__/template.marko_1_content",attrs:_.b={}}},_.c,_.g={_:_.d,"ClosureSignalIndex:clickCount":0}],_.a.click=_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.d),(_.f).add(_.g),_.e),"__tests__/tags/FancyButton.marko_0_attrs",2];M._.w()</script>
+  <button><!--M_[-->0<!--M_*3 #text/0--><!--M_]2 #text/1 3--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.e=[0,_.d={clickCount:0,"ClosureScopes:clickCount":_.f=new Set,"#childScope/0":_.c={"EventAttributes:#button/0":_.a={},"ConditionalRenderer:#text/1":"__tests__/template.marko_1_content",attrs:_.b={}}},_.c,_.g={_:_.d,"ClosureSignalIndex:clickCount":0}],_.a.click=_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.d),(_.f).add(_.g),_.e),"__tests__/tags/FancyButton.marko_0_attrs 2"];M._.w()</script>
 ```
 
 # Render End
@@ -31,8 +31,7 @@
         }], _.a.click = _.b.onClick = _._[
           "__tests__/template.marko_0/onClick"
           ](_.d), (_.f).add(_.g), _.e),
-        "__tests__/tags/FancyButton.marko_0_attrs",
-        2
+        "__tests__/tags/FancyButton.marko_0_attrs 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/change-handler-alias-assignment/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/change-handler-alias-assignment/__snapshots__/resume.expected.md
index e6155cfc2..8f7429724 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/change-handler-alias-assignment/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/change-handler-alias-assignment/__snapshots__/resume.expected.md
@@ -12,8 +12,7 @@
       M._.r = [_ =&gt; (_.b = [0, _.a = {}], _.a.$fooChange = _._[
           "__tests__/template.marko_0/fooBar"
           ](_.a), _.b),
-        "__tests__/template.marko_0_$fooChange",
-        1
+        "__tests__/template.marko_0_$fooChange 1"
       ];
       M._.w()
     </script>
@@ -39,8 +38,7 @@ container.querySelector("button").click();
       M._.r = [_ =&gt; (_.b = [0, _.a = {}], _.a.$fooChange = _._[
           "__tests__/template.marko_0/fooBar"
           ](_.a), _.b),
-        "__tests__/template.marko_0_$fooChange",
-        1
+        "__tests__/template.marko_0_$fooChange 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/change-handler-alias-assignment/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/change-handler-alias-assignment/__snapshots__/ssr.expected.md
index 8e819e4b2..a55072619 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/change-handler-alias-assignment/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/change-handler-alias-assignment/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Before</button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={}],_.a.$fooChange=_._["__tests__/template.marko_0/fooBar"](_.a),_.b),"__tests__/template.marko_0_$fooChange",1];M._.w()</script>
+  <button>Before</button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={}],_.a.$fooChange=_._["__tests__/template.marko_0/fooBar"](_.a),_.b),"__tests__/template.marko_0_$fooChange 1"];M._.w()</script>
 ```
 
 # Render End
@@ -17,8 +17,7 @@
       M._.r = [_ =&gt; (_.b = [0, _.a = {}], _.a.$fooChange = _._[
           "__tests__/template.marko_0/fooBar"
           ](_.a), _.b),
-        "__tests__/template.marko_0_$fooChange",
-        1
+        "__tests__/template.marko_0_$fooChange 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/circular-tag-var-function-serialize/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/circular-tag-var-function-serialize/__snapshots__/resume.expected.md
index ed1de8a0a..097b3b9c0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/circular-tag-var-function-serialize/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/circular-tag-var-function-serialize/__snapshots__/resume.expected.md
@@ -11,8 +11,7 @@
           ](_.a), _.b.input_valueChange = _._[
           "__tests__/template.marko_1/valueChange"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input_valueChange",
-        3
+        "__tests__/tags/child.marko_0_input_valueChange 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/circular-tag-var-function-serialize/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/circular-tag-var-function-serialize/__snapshots__/ssr.expected.md
index b3d90f868..ff0756572 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/circular-tag-var-function-serialize/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/circular-tag-var-function-serialize/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={},_.d={_:_.a},_.b={}],_.a.setter=_._["__tests__/template.marko_0/setter"](_.a),_.b.input_valueChange=_._["__tests__/template.marko_1/valueChange"](_.d),_.c),"__tests__/tags/child.marko_0_input_valueChange",3];M._.w()</script>
+  <script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={},_.d={_:_.a},_.b={}],_.a.setter=_._["__tests__/template.marko_0/setter"](_.a),_.b.input_valueChange=_._["__tests__/template.marko_1/valueChange"](_.d),_.c),"__tests__/tags/child.marko_0_input_valueChange 3"];M._.w()</script>
 ```
 
 # Render End
@@ -16,8 +16,7 @@
           ](_.a), _.b.input_valueChange = _._[
           "__tests__/template.marko_1/valueChange"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input_valueChange",
-        3
+        "__tests__/tags/child.marko_0_input_valueChange 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/resume.expected.md
index 89f5c9537..9f381df99 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/resume.expected.md
@@ -82,10 +82,7 @@ mounted 3
         }, _.d], _.a.write = _.b.write = _.c.write = _.d.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), _.e),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -180,10 +177,7 @@ destroyed 3
         }, _.d], _.a.write = _.b.write = _.c.write = _.d.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), _.e),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -265,10 +259,7 @@ destroyed 2
         }, _.d], _.a.write = _.b.write = _.c.write = _.d.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), _.e),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -338,10 +329,7 @@ destroyed 1
         }, _.d], _.a.write = _.b.write = _.c.write = _.d.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), _.e),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -442,10 +430,7 @@ mounted 3
         }, _.d], _.a.write = _.b.write = _.c.write = _.d.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), _.e),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/ssr.expected.md
index 1bee1a31d..cb37bfb3d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Toggle</button><!--M_*1 #button/0--><div></div><!--M_*1 #div/1--><!--M_[--><div>1<!--M_*3 #text/0--></div><span>1<!--M_*3 #text/1--></span><p>1<!--M_*3 #text/2--></p><!--M_[2--><div>2<!--M_*5 #text/0--></div><span>2<!--M_*5 #text/1--></span><p>2<!--M_*5 #text/2--></p><!--M_[4--><div>3<!--M_*7 #text/0--></div><span>3<!--M_*7 #text/1--></span><p>3<!--M_*7 #text/2--></p><!--M_]1 #text/2 6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.e=[0,_.a={items:[1,2,3]},{"#childScope/0":_.b={name:1,"#ClosestBranchId":2},"#LoopKey":0},_.b,{"#childScope/0":_.c={name:2,"#ClosestBranchId":4},"#LoopKey":1},_.c,{"#childScope/0":_.d={name:3,"#ClosestBranchId":6},"#LoopKey":2},_.d],_.a.write=_.b.write=_.c.write=_.d.write=_._["__tests__/template.marko_0/write"](_.a),_.e),"__tests__/tags/child.marko_0_name_write",3,5,7,"__tests__/template.marko_0_items",1];M._.w()</script>
+  <button>Toggle</button><!--M_*1 #button/0--><div></div><!--M_*1 #div/1--><!--M_[--><div>1<!--M_*3 #text/0--></div><span>1<!--M_*3 #text/1--></span><p>1<!--M_*3 #text/2--></p><!--M_[2--><div>2<!--M_*5 #text/0--></div><span>2<!--M_*5 #text/1--></span><p>2<!--M_*5 #text/2--></p><!--M_[4--><div>3<!--M_*7 #text/0--></div><span>3<!--M_*7 #text/1--></span><p>3<!--M_*7 #text/2--></p><!--M_]1 #text/2 6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.e=[0,_.a={items:[1,2,3]},{"#childScope/0":_.b={name:1,"#ClosestBranchId":2},"#LoopKey":0},_.b,{"#childScope/0":_.c={name:2,"#ClosestBranchId":4},"#LoopKey":1},_.c,{"#childScope/0":_.d={name:3,"#ClosestBranchId":6},"#LoopKey":2},_.d],_.a.write=_.b.write=_.c.write=_.d.write=_._["__tests__/template.marko_0/write"](_.a),_.e),"__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"];M._.w()</script>
 ```
 
 # Render End
@@ -82,10 +82,7 @@
         }, _.d], _.a.write = _.b.write = _.c.write = _.d.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), _.e),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/resume.expected.md
index e577a1958..16133db56 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/resume.expected.md
@@ -90,14 +90,7 @@ Inner mounted
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -201,14 +194,7 @@ Inner destroyed
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -304,14 +290,7 @@ Middle destroyed
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -392,14 +371,7 @@ Outer destroyed
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -480,14 +452,7 @@ Outer destroyed
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -560,14 +525,7 @@ Outer destroyed
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -673,14 +631,7 @@ Inner mounted
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -783,14 +734,7 @@ Outer destroyed
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/ssr.expected.md
index 3b92c3729..1172abcbc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button id=outer>Toggle Outer</button><!--M_*1 #button/0--><button id=middle>Toggle Middle</button><!--M_*1 #button/1--><button id=inner>Toggle Inner</button><!--M_*1 #button/2--><pre></pre><!--M_*1 #pre/3--><div><div>Outer a</div><span>Outer a</span><p>Outer a</p><div><div>Middle a</div><span>Middle a</span><p>Middle a</p><!--M_[--><div>Inner a</div><span>Inner a</span><p>Inner a</p><!--M_]4 #text/1 6--></div><!--M_|2 #text/1 4--></div><!--M_|1 #text/4 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.g=[0,_.a={showOuter:!0,showMiddle:!0,showInner:!0,"ClosureScopes:showInner":_.h=new Set},_.c={_:_.a},_.b={name:"Outer","#ClosestBranchId":2},_.e={_:_.c,"ClosureSignalIndex:showInner":0},_.d={name:"Middle","#ClosestBranchId":4},{_:_.e},_.f={name:"Inner","#ClosestBranchId":6}],_.a.write=_.b.write=_.d.write=_.f.write=_._["__tests__/template.marko_0/write"](_.a),(_.h).add(_.e),_.g),"__tests__/tags/child.marko_0_name_write",3,5,7,"__tests__/template.marko_0_showInner",1,"__tests__/template.marko_0_showMiddle",1,"__tests__/template.marko_0_showOuter",1];M._.w()</script>
+  <button id=outer>Toggle Outer</button><!--M_*1 #button/0--><button id=middle>Toggle Middle</button><!--M_*1 #button/1--><button id=inner>Toggle Inner</button><!--M_*1 #button/2--><pre></pre><!--M_*1 #pre/3--><div><div>Outer a</div><span>Outer a</span><p>Outer a</p><div><div>Middle a</div><span>Middle a</span><p>Middle a</p><!--M_[--><div>Inner a</div><span>Inner a</span><p>Inner a</p><!--M_]4 #text/1 6--></div><!--M_|2 #text/1 4--></div><!--M_|1 #text/4 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.g=[0,_.a={showOuter:!0,showMiddle:!0,showInner:!0,"ClosureScopes:showInner":_.h=new Set},_.c={_:_.a},_.b={name:"Outer","#ClosestBranchId":2},_.e={_:_.c,"ClosureSignalIndex:showInner":0},_.d={name:"Middle","#ClosestBranchId":4},{_:_.e},_.f={name:"Inner","#ClosestBranchId":6}],_.a.write=_.b.write=_.d.write=_.f.write=_._["__tests__/template.marko_0/write"](_.a),(_.h).add(_.e),_.g),"__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"];M._.w()</script>
 ```
 
 # Render End
@@ -90,14 +90,7 @@
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/resume.expected.md
index e275a71ac..f6a6f46c2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/resume.expected.md
@@ -31,10 +31,7 @@ mounted
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -75,10 +72,7 @@ destroyed
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -135,10 +129,7 @@ mounted
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -183,10 +174,7 @@ destroyed
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/ssr.expected.md
index f66c4767f..670ccc0b2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Toggle</button><!--M_*1 #button/0--><pre></pre><!--M_*1 #pre/1--><!--M_[--><div>a</div><span>b</span><p>c</p><!--M_]1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={show:!0},{_:_.a}]),"__tests__/template.marko_1",2,"__tests__/template.marko_0_show",1];M._.w()</script>
+  <button>Toggle</button><!--M_*1 #button/0--><pre></pre><!--M_*1 #pre/1--><!--M_[--><div>a</div><span>b</span><p>c</p><!--M_]1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={show:!0},{_:_.a}]),"__tests__/template.marko_1 2 __tests__/template.marko_0_show 1"];M._.w()</script>
 ```
 
 # Render End
@@ -33,10 +33,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/resume.expected.md
index c8e2b48e4..097fda687 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/resume.expected.md
@@ -35,10 +35,7 @@
         }], _.b.write = _._[
           "__tests__/template.marko_1/write"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input",
-        3,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/tags/child.marko_0_input 3 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -82,10 +79,7 @@ container.querySelector("button").click();
         }], _.b.write = _._[
           "__tests__/template.marko_1/write"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input",
-        3,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/tags/child.marko_0_input 3 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -144,10 +138,7 @@ container.querySelector("button").click();
         }], _.b.write = _._[
           "__tests__/template.marko_1/write"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input",
-        3,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/tags/child.marko_0_input 3 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -193,10 +184,7 @@ container.querySelector("button").click();
         }], _.b.write = _._[
           "__tests__/template.marko_1/write"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input",
-        3,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/tags/child.marko_0_input 3 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/ssr.expected.md
index 6c46fbf6d..856064bf4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Toggle</button><!--M_*1 #button/0--><div></div><!--M_*1 #div/1--><!--M_[--><div>a</div><span>b</span><p>c</p><!--M_]1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={show:!0},_.d={_:_.a},{input:_.b={},"#ClosestBranchId":2}],_.b.write=_._["__tests__/template.marko_1/write"](_.d),_.c),"__tests__/tags/child.marko_0_input",3,"__tests__/template.marko_0_show",1];M._.w()</script>
+  <button>Toggle</button><!--M_*1 #button/0--><div></div><!--M_*1 #div/1--><!--M_[--><div>a</div><span>b</span><p>c</p><!--M_]1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={show:!0},_.d={_:_.a},{input:_.b={},"#ClosestBranchId":2}],_.b.write=_._["__tests__/template.marko_1/write"](_.d),_.c),"__tests__/tags/child.marko_0_input 3 __tests__/template.marko_0_show 1"];M._.w()</script>
 ```
 
 # Render End
@@ -38,10 +38,7 @@
         }], _.b.write = _._[
           "__tests__/template.marko_1/write"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input",
-        3,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/tags/child.marko_0_input 3 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/resume.expected.md
index 67032ad89..6ead9d122 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/resume.expected.md
@@ -190,10 +190,7 @@
           .write = _.o.write = _.p.write = _._[
             "__tests__/template.marko_0/write"
             ](_.a), _.q),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 9 11 13 15 17 19 21 23 25 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -368,10 +365,7 @@ destroyed 2.3
           .write = _.o.write = _.p.write = _._[
             "__tests__/template.marko_0/write"
             ](_.a), _.q),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 9 11 13 15 17 19 21 23 25 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/ssr.expected.md
index 345173c8f..cf3233be8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Toggle</button><!--M_*1 #button/0--><div></div><!--M_*1 #div/1--><div><div>1<!--M_*3 #text/0--></div><div><div>1.1<!--M_*5 #text/0--></div></div><div><div>1.2<!--M_*7 #text/0--></div></div><div><div>1.3<!--M_*9 #text/0--></div></div><!--M_|2 #text/1 8 6 4--></div><div><div>2<!--M_*11 #text/0--></div><div><div>2.1<!--M_*13 #text/0--></div></div><div><div>2.2<!--M_*15 #text/0--></div></div><div><div>2.3<!--M_*17 #text/0--></div></div><!--M_|10 #text/1 16 14 12--></div><div><div>3<!--M_*19 #text/0--></div><div><div>3.1<!--M_*21 #text/0--></div></div><div><div>3.2<!--M_*23 #text/0--></div></div><div><div>3.3<!--M_*25 #text/0--></div></div><!--M_|18 #text/1 24 22 20--></div><!--M_|1 #text/2 18 10 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.q=[0,_.a={items:[1,2,3]},_.c={outerItem:1,_:_.a,"#childScope/0":_.b={name:"1","#ClosestBranchId":2},"#LoopKey":0},_.b,{_:_.c,"#childScope/0":_.d={name:"1.1","#ClosestBranchId":4},"#LoopKey":0},_.d,{_:_.c,"#childScope/0":_.e={name:"1.2","#ClosestBranchId":6},"#LoopKey":1},_.e,{_:_.c,"#childScope/0":_.f={name:"1.3","#ClosestBranchId":8},"#LoopKey":2},_.f,_.h={outerItem:2,_:_.a,"#childScope/0":_.g={name:"2","#ClosestBranchId":10},"#LoopKey":1},_.g,{_:_.h,"#childScope/0":_.i={name:"2.1","#ClosestBranchId":12},"#LoopKey":0},_.i,{_:_.h,"#childScope/0":_.j={name:"2.2","#ClosestBranchId":14},"#LoopKey":1},_.j,{_:_.h,"#childScope/0":_.k={name:"2.3","#ClosestBranchId":16},"#LoopKey":2},_.k,_.m={outerItem:3,_:_.a,"#childScope/0":_.l={name:"3","#ClosestBranchId":18},"#LoopKey":2},_.l,{_:_.m,"#childScope/0":_.n={name:"3.1","#ClosestBranchId":20},"#LoopKey":0},_.n,{_:_.m,"#childScope/0":_.o={name:"3.2","#ClosestBranchId":22},"#LoopKey":1},_.o,{_:_.m,"#childScope/0":_.p={name:"3.3","#ClosestBranchId":24},"#LoopKey":2},_.p],_.a.write=_.b.write=_.d.write=_.e.write=_.f.write=_.g.write=_.i.write=_.j.write=_.k.write=_.l.write=_.n.write=_.o.write=_.p.write=_._["__tests__/template.marko_0/write"](_.a),_.q),"__tests__/tags/child.marko_0_name_write",3,5,7,9,11,13,15,17,19,21,23,25,"__tests__/template.marko_0_items",1];M._.w()</script>
+  <button>Toggle</button><!--M_*1 #button/0--><div></div><!--M_*1 #div/1--><div><div>1<!--M_*3 #text/0--></div><div><div>1.1<!--M_*5 #text/0--></div></div><div><div>1.2<!--M_*7 #text/0--></div></div><div><div>1.3<!--M_*9 #text/0--></div></div><!--M_|2 #text/1 8 6 4--></div><div><div>2<!--M_*11 #text/0--></div><div><div>2.1<!--M_*13 #text/0--></div></div><div><div>2.2<!--M_*15 #text/0--></div></div><div><div>2.3<!--M_*17 #text/0--></div></div><!--M_|10 #text/1 16 14 12--></div><div><div>3<!--M_*19 #text/0--></div><div><div>3.1<!--M_*21 #text/0--></div></div><div><div>3.2<!--M_*23 #text/0--></div></div><div><div>3.3<!--M_*25 #text/0--></div></div><!--M_|18 #text/1 24 22 20--></div><!--M_|1 #text/2 18 10 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.q=[0,_.a={items:[1,2,3]},_.c={outerItem:1,_:_.a,"#childScope/0":_.b={name:"1","#ClosestBranchId":2},"#LoopKey":0},_.b,{_:_.c,"#childScope/0":_.d={name:"1.1","#ClosestBranchId":4},"#LoopKey":0},_.d,{_:_.c,"#childScope/0":_.e={name:"1.2","#ClosestBranchId":6},"#LoopKey":1},_.e,{_:_.c,"#childScope/0":_.f={name:"1.3","#ClosestBranchId":8},"#LoopKey":2},_.f,_.h={outerItem:2,_:_.a,"#childScope/0":_.g={name:"2","#ClosestBranchId":10},"#LoopKey":1},_.g,{_:_.h,"#childScope/0":_.i={name:"2.1","#ClosestBranchId":12},"#LoopKey":0},_.i,{_:_.h,"#childScope/0":_.j={name:"2.2","#ClosestBranchId":14},"#LoopKey":1},_.j,{_:_.h,"#childScope/0":_.k={name:"2.3","#ClosestBranchId":16},"#LoopKey":2},_.k,_.m={outerItem:3,_:_.a,"#childScope/0":_.l={name:"3","#ClosestBranchId":18},"#LoopKey":2},_.l,{_:_.m,"#childScope/0":_.n={name:"3.1","#ClosestBranchId":20},"#LoopKey":0},_.n,{_:_.m,"#childScope/0":_.o={name:"3.2","#ClosestBranchId":22},"#LoopKey":1},_.o,{_:_.m,"#childScope/0":_.p={name:"3.3","#ClosestBranchId":24},"#LoopKey":2},_.p],_.a.write=_.b.write=_.d.write=_.e.write=_.f.write=_.g.write=_.i.write=_.j.write=_.k.write=_.l.write=_.n.write=_.o.write=_.p.write=_._["__tests__/template.marko_0/write"](_.a),_.q),"__tests__/tags/child.marko_0_name_write 3 5 7 9 11 13 15 17 19 21 23 25 __tests__/template.marko_0_items 1"];M._.w()</script>
 ```
 
 # Render End
@@ -195,10 +195,7 @@
           .write = _.o.write = _.p.write = _._[
             "__tests__/template.marko_0/write"
             ](_.a), _.q),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 9 11 13 15 17 19 21 23 25 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/resume.expected.md
index e2346a6ba..a3278a229 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/resume.expected.md
@@ -55,10 +55,7 @@ mounted 3
         }, _.d], _.a.write = _.b.write = _.c.write = _.d.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), _.e),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -132,10 +129,7 @@ destroyed 3
         }, _.d], _.a.write = _.b.write = _.c.write = _.d.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), _.e),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -204,10 +198,7 @@ destroyed 2
         }, _.d], _.a.write = _.b.write = _.c.write = _.d.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), _.e),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -273,10 +264,7 @@ destroyed 1
         }, _.d], _.a.write = _.b.write = _.c.write = _.d.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), _.e),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -355,10 +343,7 @@ mounted 3
         }, _.d], _.a.write = _.b.write = _.c.write = _.d.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), _.e),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/ssr.expected.md
index 97722504f..5d8900f66 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Toggle</button><!--M_*1 #button/0--><div></div><!--M_*1 #div/1--><div>1<!--M_*3 #text/0--></div><div>2<!--M_*5 #text/0--></div><div>3<!--M_*7 #text/0--></div><!--M_|1 #text/2 6 4 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.e=[0,_.a={items:[1,2,3]},{"#childScope/0":_.b={name:1,"#ClosestBranchId":2},"#LoopKey":0},_.b,{"#childScope/0":_.c={name:2,"#ClosestBranchId":4},"#LoopKey":1},_.c,{"#childScope/0":_.d={name:3,"#ClosestBranchId":6},"#LoopKey":2},_.d],_.a.write=_.b.write=_.c.write=_.d.write=_._["__tests__/template.marko_0/write"](_.a),_.e),"__tests__/tags/child.marko_0_name_write",3,5,7,"__tests__/template.marko_0_items",1];M._.w()</script>
+  <button>Toggle</button><!--M_*1 #button/0--><div></div><!--M_*1 #div/1--><div>1<!--M_*3 #text/0--></div><div>2<!--M_*5 #text/0--></div><div>3<!--M_*7 #text/0--></div><!--M_|1 #text/2 6 4 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.e=[0,_.a={items:[1,2,3]},{"#childScope/0":_.b={name:1,"#ClosestBranchId":2},"#LoopKey":0},_.b,{"#childScope/0":_.c={name:2,"#ClosestBranchId":4},"#LoopKey":1},_.c,{"#childScope/0":_.d={name:3,"#ClosestBranchId":6},"#LoopKey":2},_.d],_.a.write=_.b.write=_.c.write=_.d.write=_._["__tests__/template.marko_0/write"](_.a),_.e),"__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"];M._.w()</script>
 ```
 
 # Render End
@@ -55,10 +55,7 @@
         }, _.d], _.a.write = _.b.write = _.c.write = _.d.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), _.e),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/resume.expected.md
index 5d3ef4f30..2814feeba 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/resume.expected.md
@@ -71,14 +71,7 @@ Inner mounted
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -169,14 +162,7 @@ Inner destroyed
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -262,14 +248,7 @@ Middle destroyed
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -350,14 +329,7 @@ Outer destroyed
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -438,14 +410,7 @@ Outer destroyed
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -518,14 +483,7 @@ Outer destroyed
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -613,14 +571,7 @@ Inner mounted
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
@@ -717,14 +668,7 @@ Outer destroyed
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/ssr.expected.md
index 7294d07b4..a99982a30 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button id=outer>Toggle Outer</button><!--M_*1 #button/0--><button id=middle>Toggle Middle</button><!--M_*1 #button/1--><button id=inner>Toggle Inner</button><!--M_*1 #button/2--><pre></pre><!--M_*1 #pre/3--><div><p>Outer</p><div><p>Middle</p><p>Inner</p><!--M_|4 #text/1 6--></div><!--M_|2 #text/1 4--></div><!--M_|1 #text/4 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.g=[0,_.a={showOuter:!0,showMiddle:!0,showInner:!0,"ClosureScopes:showInner":_.h=new Set},_.c={_:_.a},_.b={name:"Outer","#ClosestBranchId":2},_.e={_:_.c,"ClosureSignalIndex:showInner":0},_.d={name:"Middle","#ClosestBranchId":4},{_:_.e},_.f={name:"Inner","#ClosestBranchId":6}],_.a.write=_.b.write=_.d.write=_.f.write=_._["__tests__/template.marko_0/write"](_.a),(_.h).add(_.e),_.g),"__tests__/tags/child.marko_0_name_write",3,5,7,"__tests__/template.marko_0_showInner",1,"__tests__/template.marko_0_showMiddle",1,"__tests__/template.marko_0_showOuter",1];M._.w()</script>
+  <button id=outer>Toggle Outer</button><!--M_*1 #button/0--><button id=middle>Toggle Middle</button><!--M_*1 #button/1--><button id=inner>Toggle Inner</button><!--M_*1 #button/2--><pre></pre><!--M_*1 #pre/3--><div><p>Outer</p><div><p>Middle</p><p>Inner</p><!--M_|4 #text/1 6--></div><!--M_|2 #text/1 4--></div><!--M_|1 #text/4 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.g=[0,_.a={showOuter:!0,showMiddle:!0,showInner:!0,"ClosureScopes:showInner":_.h=new Set},_.c={_:_.a},_.b={name:"Outer","#ClosestBranchId":2},_.e={_:_.c,"ClosureSignalIndex:showInner":0},_.d={name:"Middle","#ClosestBranchId":4},{_:_.e},_.f={name:"Inner","#ClosestBranchId":6}],_.a.write=_.b.write=_.d.write=_.f.write=_._["__tests__/template.marko_0/write"](_.a),(_.h).add(_.e),_.g),"__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"];M._.w()</script>
 ```
 
 # Render End
@@ -71,14 +71,7 @@
         }], _.a.write = _.b.write = _.d.write = _.f.write = _._[
           "__tests__/template.marko_0/write"
           ](_.a), (_.h).add(_.e), _.g),
-        "__tests__/tags/child.marko_0_name_write",
-        3, 5, 7,
-        "__tests__/template.marko_0_showInner",
-        1,
-        "__tests__/template.marko_0_showMiddle",
-        1,
-        "__tests__/template.marko_0_showOuter",
-        1
+        "__tests__/tags/child.marko_0_name_write 3 5 7 __tests__/template.marko_0_showInner 1 __tests__/template.marko_0_showMiddle 1 __tests__/template.marko_0_showOuter 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/resume.expected.md
index c5b24c9a7..6430cfa51 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/resume.expected.md
@@ -24,10 +24,7 @@ mounted
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -67,10 +64,7 @@ destroyed
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -117,10 +111,7 @@ mounted
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -165,10 +156,7 @@ destroyed
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/ssr.expected.md
index 9e72b4fea..c54ace02d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Toggle</button><!--M_*1 #button/0--><pre></pre><!--M_*1 #pre/1--><div>child</div><!--M_|1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={show:!0},{_:_.a}]),"__tests__/template.marko_1",2,"__tests__/template.marko_0_show",1];M._.w()</script>
+  <button>Toggle</button><!--M_*1 #button/0--><pre></pre><!--M_*1 #pre/1--><div>child</div><!--M_|1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={show:!0},{_:_.a}]),"__tests__/template.marko_1 2 __tests__/template.marko_0_show 1"];M._.w()</script>
 ```
 
 # Render End
@@ -26,10 +26,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/resume.expected.md
index a43db2124..8483a022d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/resume.expected.md
@@ -28,10 +28,7 @@
         }], _.b.write = _._[
           "__tests__/template.marko_1/write"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input",
-        3,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/tags/child.marko_0_input 3 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -74,10 +71,7 @@ container.querySelector("button").click();
         }], _.b.write = _._[
           "__tests__/template.marko_1/write"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input",
-        3,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/tags/child.marko_0_input 3 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -126,10 +120,7 @@ container.querySelector("button").click();
         }], _.b.write = _._[
           "__tests__/template.marko_1/write"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input",
-        3,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/tags/child.marko_0_input 3 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -175,10 +166,7 @@ container.querySelector("button").click();
         }], _.b.write = _._[
           "__tests__/template.marko_1/write"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input",
-        3,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/tags/child.marko_0_input 3 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/ssr.expected.md
index 22d551bca..02d24ba5d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Toggle</button><!--M_*1 #button/0--><div></div><!--M_*1 #div/1--><div>child</div><!--M_|1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={show:!0},_.d={_:_.a},{input:_.b={},"#ClosestBranchId":2}],_.b.write=_._["__tests__/template.marko_1/write"](_.d),_.c),"__tests__/tags/child.marko_0_input",3,"__tests__/template.marko_0_show",1];M._.w()</script>
+  <button>Toggle</button><!--M_*1 #button/0--><div></div><!--M_*1 #div/1--><div>child</div><!--M_|1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={show:!0},_.d={_:_.a},{input:_.b={},"#ClosestBranchId":2}],_.b.write=_._["__tests__/template.marko_1/write"](_.d),_.c),"__tests__/tags/child.marko_0_input 3 __tests__/template.marko_0_show 1"];M._.w()</script>
 ```
 
 # Render End
@@ -31,10 +31,7 @@
         }], _.b.write = _._[
           "__tests__/template.marko_1/write"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input",
-        3,
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/tags/child.marko_0_input 3 __tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/closure-owner-scope-serialize-in-serialized-function/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/closure-owner-scope-serialize-in-serialized-function/__snapshots__/resume.expected.md
index 1835c7b4c..3a70d44af 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/closure-owner-scope-serialize-in-serialized-function/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/closure-owner-scope-serialize-in-serialized-function/__snapshots__/resume.expected.md
@@ -18,8 +18,7 @@
         }], _.a.run = _._[
           "__tests__/template.marko_1/run"
           ](_.a), _.c),
-        "__tests__/template.marko_1_run",
-        2
+        "__tests__/template.marko_1_run 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/closure-owner-scope-serialize-in-serialized-function/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/closure-owner-scope-serialize-in-serialized-function/__snapshots__/ssr.expected.md
index 7105c2398..f5ee9ec44 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/closure-owner-scope-serialize-in-serialized-function/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/closure-owner-scope-serialize-in-serialized-function/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*2 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.b={text:_._["__tests__/template.marko_0/text"]},_.a={_:_.b}],_.a.run=_._["__tests__/template.marko_1/run"](_.a),_.c),"__tests__/template.marko_1_run",2];M._.w()</script>
+  <div></div><!--M_*2 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.b={text:_._["__tests__/template.marko_0/text"]},_.a={_:_.b}],_.a.run=_._["__tests__/template.marko_1/run"](_.a),_.c),"__tests__/template.marko_1_run 2"];M._.w()</script>
 ```
 
 # Render End
@@ -21,8 +21,7 @@
         }], _.a.run = _._[
           "__tests__/template.marko_1/run"
           ](_.a), _.c),
-        "__tests__/template.marko_1_run",
-        2
+        "__tests__/template.marko_1_run 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/closure-serialize-reason/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/closure-serialize-reason/__snapshots__/resume.expected.md
index 3883ebecb..bae2c6444 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/closure-serialize-reason/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/closure-serialize-reason/__snapshots__/resume.expected.md
@@ -20,8 +20,7 @@
         }], _.a.getMessage = _._[
           "__tests__/template.marko_0/getMessage"
           ](_.a), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -57,8 +56,7 @@ container.querySelector("button").click();
         }], _.a.getMessage = _._[
           "__tests__/template.marko_0/getMessage"
           ](_.a), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -100,8 +98,7 @@ container.querySelector("button").click();
         }], _.a.getMessage = _._[
           "__tests__/template.marko_0/getMessage"
           ](_.a), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/closure-serialize-reason/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/closure-serialize-reason/__snapshots__/ssr.expected.md
index b349d1a0e..83cecde30 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/closure-serialize-reason/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/closure-serialize-reason/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><!--M_}1 #div/0--></div><button>0<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={input_message:"hello",x:0}],_.a.getMessage=_._["__tests__/template.marko_0/getMessage"](_.a),_.b),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <div><!--M_}1 #div/0--></div><button>0<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={input_message:"hello",x:0}],_.a.getMessage=_._["__tests__/template.marko_0/getMessage"](_.a),_.b),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -24,8 +24,7 @@
         }], _.a.getMessage = _._[
           "__tests__/template.marko_0/getMessage"
           ](_.a), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/resume.expected.md
index ea7749ad5..2260e4fe9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
             {}
           }
         }, _.a]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -53,8 +52,7 @@ container.querySelector("button").click();
             {}
           }
         }, _.a]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/ssr.expected.md
index 99580c328..fe4e9b097 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>0<!--M_*2 #text/0--></div><button></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{count:0,"#childScope/0":_.a={dummy:{}}},_.a]),"__tests__/template.marko_0_count",1];M._.w()</script>
+  <div>0<!--M_*2 #text/0--></div><button></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{count:0,"#childScope/0":_.a={dummy:{}}},_.a]),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -24,8 +24,7 @@
             {}
           }
         }, _.a]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/resume.expected.md
index 0ee8715a0..64b5dc800 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/resume.expected.md
@@ -34,8 +34,7 @@
           },
           count: 0
         }]),
-        "__tests__/tags/counter.marko_0_count",
-        2, 3
+        "__tests__/tags/counter.marko_0_count 2 3"
       ];
       M._.w()
     </script>
@@ -83,8 +82,7 @@ container.querySelectorAll("button").forEach(button => button.click());
           },
           count: 0
         }]),
-        "__tests__/tags/counter.marko_0_count",
-        2, 3
+        "__tests__/tags/counter.marko_0_count 2 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/ssr.expected.md
index 075d6d3f5..5df9a2046 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>$0.00<!--M_*2 #text/1--></button><!--M_*2 #button/0--><button>$0.00<!--M_*3 #text/1--></button><!--M_*3 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,1,{input:{format:_._["__tests__/template.marko_0/formatNumber"]},count:0},{input:{format:_._["__tests__/template.marko_0/formatNumber2"]},count:0}]),"__tests__/tags/counter.marko_0_count",2,3];M._.w()</script>
+  <button>$0.00<!--M_*2 #text/1--></button><!--M_*2 #button/0--><button>$0.00<!--M_*3 #text/1--></button><!--M_*3 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,1,{input:{format:_._["__tests__/template.marko_0/formatNumber"]},count:0},{input:{format:_._["__tests__/template.marko_0/formatNumber2"]},count:0}]),"__tests__/tags/counter.marko_0_count 2 3"];M._.w()</script>
 ```
 
 # Render End
@@ -39,8 +39,7 @@
           },
           count: 0
         }]),
-        "__tests__/tags/counter.marko_0_count",
-        2, 3
+        "__tests__/tags/counter.marko_0_count 2 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/conditional-table-row/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/conditional-table-row/__snapshots__/resume.expected.md
index 9f3116d4b..90cd5faac 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/conditional-table-row/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/conditional-table-row/__snapshots__/resume.expected.md
@@ -18,8 +18,7 @@
         {
           show: !1
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -56,8 +55,7 @@ container.querySelector("button").click();
         {
           show: !1
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -91,8 +89,7 @@ container.querySelector("button").click();
         {
           show: !1
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -132,8 +129,7 @@ container.querySelector("button").click();
         {
           show: !1
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/conditional-table-row/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/conditional-table-row/__snapshots__/ssr.expected.md
index 2ebce358f..8a9720772 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/conditional-table-row/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/conditional-table-row/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <table><tbody><!--M_}1 #tbody/0--></tbody></table><button>Toggle</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{show:!1}]),"__tests__/template.marko_0_show",1];M._.w()</script>
+  <table><tbody><!--M_}1 #tbody/0--></tbody></table><button>Toggle</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{show:!1}]),"__tests__/template.marko_0_show 1"];M._.w()</script>
 ```
 
 # Render End
@@ -23,8 +23,7 @@
         {
           show: !1
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/resume.expected.md
index a16aeb30c..4f1d4b83a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/resume.expected.md
@@ -24,8 +24,7 @@
           ._[
             "__tests__/template.marko_0/checkedChange"
             ](_.d), _.c),
-        "__tests__/tags/checkbox.marko_0_input",
-        2
+        "__tests__/tags/checkbox.marko_0_input 2"
       ];
       M._.w()
     </script>
@@ -64,8 +63,7 @@ container.querySelector("input").click();
           ._[
             "__tests__/template.marko_0/checkedChange"
             ](_.d), _.c),
-        "__tests__/tags/checkbox.marko_0_input",
-        2
+        "__tests__/tags/checkbox.marko_0_input 2"
       ];
       M._.w()
     </script>
@@ -107,8 +105,7 @@ container.querySelector("input").click();
           ._[
             "__tests__/template.marko_0/checkedChange"
             ](_.d), _.c),
-        "__tests__/tags/checkbox.marko_0_input",
-        2
+        "__tests__/tags/checkbox.marko_0_input 2"
       ];
       M._.w()
     </script>
@@ -151,8 +148,7 @@ container.querySelector("input").click();
           ._[
             "__tests__/template.marko_0/checkedChange"
             ](_.d), _.c),
-        "__tests__/tags/checkbox.marko_0_input",
-        2
+        "__tests__/tags/checkbox.marko_0_input 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/ssr.expected.md
index dcbf85cce..a1fda5748 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <input type=checkbox><!--M_*2 #input/0--><span>false<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.d={"#childScope/0":_.a={"ControlledType:#input/0":0,input:_.b={checked:!1}}},_.a],_.a["ControlledHandler:#input/0"]=_.b.checkedChange=_._["__tests__/template.marko_0/checkedChange"](_.d),_.c),"__tests__/tags/checkbox.marko_0_input",2];M._.w()</script>
+  <input type=checkbox><!--M_*2 #input/0--><span>false<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.d={"#childScope/0":_.a={"ControlledType:#input/0":0,input:_.b={checked:!1}}},_.a],_.a["ControlledHandler:#input/0"]=_.b.checkedChange=_._["__tests__/template.marko_0/checkedChange"](_.d),_.c),"__tests__/tags/checkbox.marko_0_input 2"];M._.w()</script>
 ```
 
 # Render End
@@ -29,8 +29,7 @@
           ._[
             "__tests__/template.marko_0/checkedChange"
             ](_.d), _.c),
-        "__tests__/tags/checkbox.marko_0_input",
-        2
+        "__tests__/tags/checkbox.marko_0_input 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/resume.expected.md
index f63ebecee..726d69a4e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/resume.expected.md
@@ -38,8 +38,7 @@
           "ControlledHandler:#input/2"] = _.a.$checkedValueChange = _._[
             "__tests__/template.marko_0/checkedValueChange2"
             ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -91,8 +90,7 @@ container.querySelectorAll(`input`)[1].click();
           "ControlledHandler:#input/2"] = _.a.$checkedValueChange = _._[
             "__tests__/template.marko_0/checkedValueChange2"
             ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -148,8 +146,7 @@ container.querySelectorAll(`input`)[2].click();
           "ControlledHandler:#input/2"] = _.a.$checkedValueChange = _._[
             "__tests__/template.marko_0/checkedValueChange2"
             ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -205,8 +202,7 @@ container.querySelectorAll(`input`)[0].click();
           "ControlledHandler:#input/2"] = _.a.$checkedValueChange = _._[
             "__tests__/template.marko_0/checkedValueChange2"
             ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/ssr.expected.md
index 3c98be1a0..c154d8683 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <input value=a checked type=radio><!--M_*1 #input/0--><input value=b type=radio><!--M_*1 #input/1--><input value=c type=radio><!--M_*1 #input/2--><span>a<!--M_*1 #text/3--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#input/0":1,"ControlledValue:#input/0":"a","ControlledType:#input/1":1,"ControlledValue:#input/1":"a","ControlledType:#input/2":1,"ControlledValue:#input/2":"a",checkedValue:"a"}],_.a["ControlledHandler:#input/0"]=_.a["ControlledHandler:#input/1"]=_.a["ControlledHandler:#input/2"]=_.a.$checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange2"](_.a),_.b),"__tests__/template.marko_0",1];M._.w()</script>
+  <input value=a checked type=radio><!--M_*1 #input/0--><input value=b type=radio><!--M_*1 #input/1--><input value=c type=radio><!--M_*1 #input/2--><span>a<!--M_*1 #text/3--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#input/0":1,"ControlledValue:#input/0":"a","ControlledType:#input/1":1,"ControlledValue:#input/1":"a","ControlledType:#input/2":1,"ControlledValue:#input/2":"a",checkedValue:"a"}],_.a["ControlledHandler:#input/0"]=_.a["ControlledHandler:#input/1"]=_.a["ControlledHandler:#input/2"]=_.a.$checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange2"](_.a),_.b),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -43,8 +43,7 @@
           "ControlledHandler:#input/2"] = _.a.$checkedValueChange = _._[
             "__tests__/template.marko_0/checkedValueChange2"
             ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/resume.expected.md
index 23a134425..5e9d84a02 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/resume.expected.md
@@ -57,8 +57,7 @@
           "ControlledHandler:#input/0"] = _.h.checkedValueChange = _._[
           "__tests__/template.marko_0/checkedValueChange2"
           ](_.a), _.i),
-        "__tests__/tags/checkbox.marko_0_input",
-        2, 3, 4
+        "__tests__/tags/checkbox.marko_0_input 2 3 4"
       ];
       M._.w()
     </script>
@@ -128,8 +127,7 @@ container.querySelector("input").click();
           "ControlledHandler:#input/0"] = _.h.checkedValueChange = _._[
           "__tests__/template.marko_0/checkedValueChange2"
           ](_.a), _.i),
-        "__tests__/tags/checkbox.marko_0_input",
-        2, 3, 4
+        "__tests__/tags/checkbox.marko_0_input 2 3 4"
       ];
       M._.w()
     </script>
@@ -204,8 +202,7 @@ container.querySelector("input").click();
           "ControlledHandler:#input/0"] = _.h.checkedValueChange = _._[
           "__tests__/template.marko_0/checkedValueChange2"
           ](_.a), _.i),
-        "__tests__/tags/checkbox.marko_0_input",
-        2, 3, 4
+        "__tests__/tags/checkbox.marko_0_input 2 3 4"
       ];
       M._.w()
     </script>
@@ -279,8 +276,7 @@ container.querySelector("input").click();
           "ControlledHandler:#input/0"] = _.h.checkedValueChange = _._[
           "__tests__/template.marko_0/checkedValueChange2"
           ](_.a), _.i),
-        "__tests__/tags/checkbox.marko_0_input",
-        2, 3, 4
+        "__tests__/tags/checkbox.marko_0_input 2 3 4"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/ssr.expected.md
index 523a435d7..84e2c1110 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <input value=a checked type=checkbox><!--M_*2 #input/0--><input value=b checked type=checkbox><!--M_*3 #input/0--><input value=c type=checkbox><!--M_*4 #input/0--><span>a,b<!--M_*1 #text/3--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.i=[0,_.a={"#childScope/0":_.b={"ControlledType:#input/0":1,"ControlledValue:#input/0":_.c=["a","b"],input:_.d={checkedValue:_.c,value:"a"}},"#childScope/1":_.e={"ControlledType:#input/0":1,"ControlledValue:#input/0":_.c,input:_.f={checkedValue:_.c,value:"b"}},"#childScope/2":_.g={"ControlledType:#input/0":1,"ControlledValue:#input/0":_.c,input:_.h={checkedValue:_.c,value:"c"}}},_.b,_.e,_.g],_.a.$checkedValueChange=_.b["ControlledHandler:#input/0"]=_.d.checkedValueChange=_.e["ControlledHandler:#input/0"]=_.f.checkedValueChange=_.g["ControlledHandler:#input/0"]=_.h.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange2"](_.a),_.i),"__tests__/tags/checkbox.marko_0_input",2,3,4];M._.w()</script>
+  <input value=a checked type=checkbox><!--M_*2 #input/0--><input value=b checked type=checkbox><!--M_*3 #input/0--><input value=c type=checkbox><!--M_*4 #input/0--><span>a,b<!--M_*1 #text/3--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.i=[0,_.a={"#childScope/0":_.b={"ControlledType:#input/0":1,"ControlledValue:#input/0":_.c=["a","b"],input:_.d={checkedValue:_.c,value:"a"}},"#childScope/1":_.e={"ControlledType:#input/0":1,"ControlledValue:#input/0":_.c,input:_.f={checkedValue:_.c,value:"b"}},"#childScope/2":_.g={"ControlledType:#input/0":1,"ControlledValue:#input/0":_.c,input:_.h={checkedValue:_.c,value:"c"}}},_.b,_.e,_.g],_.a.$checkedValueChange=_.b["ControlledHandler:#input/0"]=_.d.checkedValueChange=_.e["ControlledHandler:#input/0"]=_.f.checkedValueChange=_.g["ControlledHandler:#input/0"]=_.h.checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange2"](_.a),_.i),"__tests__/tags/checkbox.marko_0_input 2 3 4"];M._.w()</script>
 ```
 
 # Render End
@@ -62,8 +62,7 @@
           "ControlledHandler:#input/0"] = _.h.checkedValueChange = _._[
           "__tests__/template.marko_0/checkedValueChange2"
           ](_.a), _.i),
-        "__tests__/tags/checkbox.marko_0_input",
-        2, 3, 4
+        "__tests__/tags/checkbox.marko_0_input 2 3 4"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/resume.expected.md
index 94b06a635..89446106c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/resume.expected.md
@@ -39,8 +39,7 @@
           "ControlledHandler:#input/2"] = _.a.$checkedValueChange = _._[
             "__tests__/template.marko_0/checkedValueChange2"
             ](_.a), _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -92,8 +91,7 @@ container.querySelectorAll(`input`)[1].click();
           "ControlledHandler:#input/2"] = _.a.$checkedValueChange = _._[
             "__tests__/template.marko_0/checkedValueChange2"
             ](_.a), _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -150,8 +148,7 @@ container.querySelectorAll(`input`)[2].click();
           "ControlledHandler:#input/2"] = _.a.$checkedValueChange = _._[
             "__tests__/template.marko_0/checkedValueChange2"
             ](_.a), _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -207,8 +204,7 @@ container.querySelectorAll(`input`)[0].click();
           "ControlledHandler:#input/2"] = _.a.$checkedValueChange = _._[
             "__tests__/template.marko_0/checkedValueChange2"
             ](_.a), _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/ssr.expected.md
index b41983f55..614143e22 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <input value=a checked type=checkbox><!--M_*1 #input/0--><input value=b checked type=checkbox><!--M_*1 #input/1--><input value=c type=checkbox><!--M_*1 #input/2--><span>a,b<!--M_*1 #text/3--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"ControlledType:#input/0":1,"ControlledValue:#input/0":_.b=["a","b"],"ControlledType:#input/1":1,"ControlledValue:#input/1":_.b,"ControlledType:#input/2":1,"ControlledValue:#input/2":_.b,checkedValue:_.b}],_.a["ControlledHandler:#input/0"]=_.a["ControlledHandler:#input/1"]=_.a["ControlledHandler:#input/2"]=_.a.$checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange2"](_.a),_.c),"__tests__/template.marko_0",1];M._.w()</script>
+  <input value=a checked type=checkbox><!--M_*1 #input/0--><input value=b checked type=checkbox><!--M_*1 #input/1--><input value=c type=checkbox><!--M_*1 #input/2--><span>a,b<!--M_*1 #text/3--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"ControlledType:#input/0":1,"ControlledValue:#input/0":_.b=["a","b"],"ControlledType:#input/1":1,"ControlledValue:#input/1":_.b,"ControlledType:#input/2":1,"ControlledValue:#input/2":_.b,checkedValue:_.b}],_.a["ControlledHandler:#input/0"]=_.a["ControlledHandler:#input/1"]=_.a["ControlledHandler:#input/2"]=_.a.$checkedValueChange=_._["__tests__/template.marko_0/checkedValueChange2"](_.a),_.c),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -44,8 +44,7 @@
           "ControlledHandler:#input/2"] = _.a.$checkedValueChange = _._[
             "__tests__/template.marko_0/checkedValueChange2"
             ](_.a), _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/resume.expected.md
index 961f89a13..b3eecff89 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
         }], _.a["ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/checkedChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -54,8 +53,7 @@ container.querySelector("input").click();
         }], _.a["ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/checkedChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -92,8 +90,7 @@ container.querySelector("input").click();
         }], _.a["ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/checkedChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -131,8 +128,7 @@ container.querySelector("input").click();
         }], _.a["ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/checkedChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/ssr.expected.md
index 802afbccc..6e4a157a4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <input type=checkbox><!--M_*1 #input/0--><span>false<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#input/0":0,checked:!1}],_.a["ControlledHandler:#input/0"]=_._["__tests__/template.marko_0/checkedChange"](_.a),_.b),"__tests__/template.marko_0",1];M._.w()</script>
+  <input type=checkbox><!--M_*1 #input/0--><span>false<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#input/0":0,checked:!1}],_.a["ControlledHandler:#input/0"]=_._["__tests__/template.marko_0/checkedChange"](_.a),_.b),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -24,8 +24,7 @@
         }], _.a["ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/checkedChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-dynamic-checkbox-checked-value/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-dynamic-checkbox-checked-value/__snapshots__/resume.expected.md
index e5a02792c..90a9a88c5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-dynamic-checkbox-checked-value/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-dynamic-checkbox-checked-value/__snapshots__/resume.expected.md
@@ -46,12 +46,7 @@
           "ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/checkedValueChange2"
           ](_.a), _.c),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -111,12 +106,7 @@ container.querySelector(`input[value=b]`).click();
           "ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/checkedValueChange2"
           ](_.a), _.c),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -175,12 +165,7 @@ container.querySelector("button").click();
           "ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/checkedValueChange2"
           ](_.a), _.c),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -245,12 +230,7 @@ container.querySelector("button").click();
           "ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/checkedValueChange2"
           ](_.a), _.c),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -315,12 +295,7 @@ container.querySelector(`input[value=a]`).click();
           "ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/checkedValueChange2"
           ](_.a), _.c),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-dynamic-checkbox-checked-value/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-dynamic-checkbox-checked-value/__snapshots__/ssr.expected.md
index ea82c482c..c6bfbbec8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-dynamic-checkbox-checked-value/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-dynamic-checkbox-checked-value/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <input value=a checked type=radio><!--M_*1 #input/0--><input value=b type=radio><!--M_*2 #input/0--><!--M_|1 #text/1 2--><input value=c type=radio><!--M_*1 #input/2--><span>a<!--M_*1 #text/3--></span><button>Toggle</button><!--M_*1 #button/4--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"ControlledType:#input/0":1,"ControlledValue:#input/0":"a","ControlledType:#input/2":1,"ControlledValue:#input/2":"a",show:!0,checkedValue:"a"},_.b={"ControlledType:#input/0":1,"ControlledValue:#input/0":"a",_:_.a}],_.a["ControlledHandler:#input/0"]=_.a["ControlledHandler:#input/2"]=_.a.$checkedValueChange=_.b["ControlledHandler:#input/0"]=_._["__tests__/template.marko_0/checkedValueChange2"](_.a),_.c),"__tests__/template.marko_1",2,"__tests__/template.marko_0_show",1,"__tests__/template.marko_0",1];M._.w()</script>
+  <input value=a checked type=radio><!--M_*1 #input/0--><input value=b type=radio><!--M_*2 #input/0--><!--M_|1 #text/1 2--><input value=c type=radio><!--M_*1 #input/2--><span>a<!--M_*1 #text/3--></span><button>Toggle</button><!--M_*1 #button/4--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"ControlledType:#input/0":1,"ControlledValue:#input/0":"a","ControlledType:#input/2":1,"ControlledValue:#input/2":"a",show:!0,checkedValue:"a"},_.b={"ControlledType:#input/0":1,"ControlledValue:#input/0":"a",_:_.a}],_.a["ControlledHandler:#input/0"]=_.a["ControlledHandler:#input/2"]=_.a.$checkedValueChange=_.b["ControlledHandler:#input/0"]=_._["__tests__/template.marko_0/checkedValueChange2"](_.a),_.c),"__tests__/template.marko_1 2 __tests__/template.marko_0_show 1 __tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -51,12 +51,7 @@
           "ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/checkedValueChange2"
           ](_.a), _.c),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_show",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_show 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/resume.expected.md
index 0c9df6d41..ba07f4d19 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/resume.expected.md
@@ -20,8 +20,7 @@
         }], _.a["ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -60,8 +59,7 @@ input.dispatchEvent(new window.Event("input", {
         }], _.a["ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -104,8 +102,7 @@ input.dispatchEvent(new window.Event("input", {
         }], _.a["ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -148,8 +145,7 @@ input.dispatchEvent(new window.Event("input", {
         }], _.a["ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/ssr.expected.md
index 52baf283a..5a4631cea 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <input value=hello type=text><!--M_*1 #input/0--><span>hello<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#input/0":2,value:"hello"}],_.a["ControlledHandler:#input/0"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0",1];M._.w()</script>
+  <input value=hello type=text><!--M_*1 #input/0--><span>hello<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#input/0":2,value:"hello"}],_.a["ControlledHandler:#input/0"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -25,8 +25,7 @@
         }], _.a["ControlledHandler:#input/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/resume.expected.md
index 020a533bf..ce67b5b33 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/resume.expected.md
@@ -42,8 +42,7 @@
         {}], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.c), _.b),
-        "__tests__/template.marko_1",
-        3, "_dynamicTagScript", 2
+        "__tests__/template.marko_1 3 _dynamicTagScript 2"
       ];
       M._.w()
     </script>
@@ -104,8 +103,7 @@ select.dispatchEvent(new window.Event("input", {
         {}], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.c), _.b),
-        "__tests__/template.marko_1",
-        3, "_dynamicTagScript", 2
+        "__tests__/template.marko_1 3 _dynamicTagScript 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/ssr.expected.md
index b7d2e221a..eb690f037 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <select><option value=a>A</option><!--M_*3 #option/0--><option value=b selected>B</option><!--M_*3 #option/1--><option value=c>C</option><!--M_*3 #option/2--></select><!--M_'1 #text/0 2--><span>b<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"ConditionalRenderer:#text/0":"select",tag:"select"},_.a={"ControlledType:#select/0":3,"ControlledValue:#select/0":"b","#Renderer":"select"},{}],_.a["ControlledHandler:#select/0"]=_._["__tests__/template.marko_0/valueChange"](_.c),_.b),"__tests__/template.marko_1",3,"_dynamicTagScript",2];M._.w()</script>
+  <select><option value=a>A</option><!--M_*3 #option/0--><option value=b selected>B</option><!--M_*3 #option/1--><option value=c>C</option><!--M_*3 #option/2--></select><!--M_'1 #text/0 2--><span>b<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"ConditionalRenderer:#text/0":"select",tag:"select"},_.a={"ControlledType:#select/0":3,"ControlledValue:#select/0":"b","#Renderer":"select"},{}],_.a["ControlledHandler:#select/0"]=_._["__tests__/template.marko_0/valueChange"](_.c),_.b),"__tests__/template.marko_1 3 _dynamicTagScript 2"];M._.w()</script>
 ```
 
 # Render End
@@ -47,8 +47,7 @@
         {}], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.c), _.b),
-        "__tests__/template.marko_1",
-        3, "_dynamicTagScript", 2
+        "__tests__/template.marko_1 3 _dynamicTagScript 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-select-mutated-option/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-select-mutated-option/__snapshots__/resume.expected.md
index 0b5394450..4a884ed93 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-select-mutated-option/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-select-mutated-option/__snapshots__/resume.expected.md
@@ -70,10 +70,7 @@
         }], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_options",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_options 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -151,10 +148,7 @@ container.querySelector(".remove").click();
         }], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_options",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_options 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -231,10 +225,7 @@ container.querySelector(".remove").click();
         }], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_options",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_options 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -304,10 +295,7 @@ container.querySelector(".remove").click();
         }], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_options",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_options 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -383,10 +371,7 @@ container.querySelector(".add").click();
         }], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_options",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_options 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -467,10 +452,7 @@ container.querySelector(".add").click();
         }], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_options",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_options 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -555,10 +537,7 @@ container.querySelector(".add").click();
         }], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_options",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_options 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-select-mutated-option/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-select-mutated-option/__snapshots__/ssr.expected.md
index a3d4620a7..f07c42e09 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-select-mutated-option/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-select-mutated-option/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <form><select><option value=1 selected>1<!--M_*2 #text/1--></option><!--M_*2 #option/0--><option value=2>2<!--M_*3 #text/1--></option><!--M_*3 #option/0--><option value=3>3<!--M_*4 #text/1--></option><!--M_*4 #option/0--><!--M_}1 #select/0 4 3 2--></select><button type=reset>reset</button></form><div>1<!--M_*1 #text/1--></div><button class=remove>Remove option</button><!--M_*1 #button/2--><button class=add>Add option</button><!--M_*1 #button/3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#select/0":3,"ControlledValue:#select/0":1,options:[1,2,3],value:1},{"#LoopKey":1},{"#LoopKey":2},{"#LoopKey":3}],_.a["ControlledHandler:#select/0"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0_options",1,"__tests__/template.marko_0",1];M._.w()</script>
+  <form><select><option value=1 selected>1<!--M_*2 #text/1--></option><!--M_*2 #option/0--><option value=2>2<!--M_*3 #text/1--></option><!--M_*3 #option/0--><option value=3>3<!--M_*4 #text/1--></option><!--M_*4 #option/0--><!--M_}1 #select/0 4 3 2--></select><button type=reset>reset</button></form><div>1<!--M_*1 #text/1--></div><button class=remove>Remove option</button><!--M_*1 #button/2--><button class=add>Add option</button><!--M_*1 #button/3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#select/0":3,"ControlledValue:#select/0":1,options:[1,2,3],value:1},{"#LoopKey":1},{"#LoopKey":2},{"#LoopKey":3}],_.a["ControlledHandler:#select/0"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0_options 1 __tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -75,10 +75,7 @@
         }], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_options",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_options 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-select/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-select/__snapshots__/resume.expected.md
index fcd4e487e..f5c2da87b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-select/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-select/__snapshots__/resume.expected.md
@@ -35,8 +35,7 @@
         }], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -90,8 +89,7 @@ select.dispatchEvent(new window.Event("input", {
         }], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-select/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-select/__snapshots__/ssr.expected.md
index 8d08dfa32..7332d417c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-select/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-select/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <select><option value=a>A</option><option value=b selected>B</option><option value=c>C</option></select><!--M_*1 #select/0--><span>b<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#select/0":3,"ControlledValue:#select/0":"b",value:"b"}],_.a["ControlledHandler:#select/0"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0",1];M._.w()</script>
+  <select><option value=a>A</option><option value=b selected>B</option><option value=c>C</option></select><!--M_*1 #select/0--><span>b<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#select/0":3,"ControlledValue:#select/0":"b",value:"b"}],_.a["ControlledHandler:#select/0"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -40,8 +40,7 @@
         }], _.a["ControlledHandler:#select/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/resume.expected.md
index 7352f9563..7fb1a87cd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
         }], _.a["ControlledHandler:#textarea/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -58,8 +57,7 @@ textarea.dispatchEvent(new window.Event("input", {
         }], _.a["ControlledHandler:#textarea/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -101,8 +99,7 @@ textarea.dispatchEvent(new window.Event("input", {
         }], _.a["ControlledHandler:#textarea/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -144,8 +141,7 @@ textarea.dispatchEvent(new window.Event("input", {
         }], _.a["ControlledHandler:#textarea/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/ssr.expected.md
index ea9501c8d..5f47b5a4f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <textarea>hello</textarea><!--M_*1 #textarea/0--><span>hello<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#textarea/0":2,value:"hello"}],_.a["ControlledHandler:#textarea/0"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0",1];M._.w()</script>
+  <textarea>hello</textarea><!--M_*1 #textarea/0--><span>hello<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#textarea/0":2,value:"hello"}],_.a["ControlledHandler:#textarea/0"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -24,8 +24,7 @@
         }], _.a["ControlledHandler:#textarea/0"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/resume.expected.md
index f61bf70e0..74bebe3d0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/resume.expected.md
@@ -31,8 +31,7 @@
           a: 0,
           b: 0
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -77,8 +76,7 @@ container.querySelector("button.a").click();
           a: 0,
           b: 0
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -128,8 +126,7 @@ container.querySelector("button.b").click();
           a: 0,
           b: 0
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/ssr.expected.md
index 1e6f58439..d35024b5b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><button class=a>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--> + <button class=b>0<!--M_*1 #text/3--></button><!--M_*1 #button/2--> = <!>0<!--M_*1 #text/4--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{a:0,b:0}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <div><button class=a>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--> + <button class=b>0<!--M_*1 #text/3--></button><!--M_*1 #button/2--> = <!>0<!--M_*1 #text/4--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{a:0,b:0}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -36,8 +36,7 @@
           a: 0,
           b: 0
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/resume.expected.md
index a770f64a7..92496f095 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/resume.expected.md
@@ -23,8 +23,7 @@
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.b), (_.d).add(_.e), _.c),
-        "__tests__/template.marko_1_count",
-        5
+        "__tests__/template.marko_1_count 5"
       ];
       M._.w()
     </script>
@@ -61,8 +60,7 @@ container.querySelector("button").click();
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.b), (_.d).add(_.e), _.c),
-        "__tests__/template.marko_1_count",
-        5
+        "__tests__/template.marko_1_count 5"
       ];
       M._.w()
     </script>
@@ -103,8 +101,7 @@ container.querySelector("button").click();
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.b), (_.d).add(_.e), _.c),
-        "__tests__/template.marko_1_count",
-        5
+        "__tests__/template.marko_1_count 5"
       ];
       M._.w()
     </script>
@@ -145,8 +142,7 @@ container.querySelector("button").click();
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.b), (_.d).add(_.e), _.c),
-        "__tests__/template.marko_1_count",
-        5
+        "__tests__/template.marko_1_count 5"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/ssr.expected.md
index de8a14fb7..30762a2c7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*5 #text/1--></button><!--M_*5 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={},"ClosureScopes:count":_.d=new Set},_.a,2,_.e={_:_.b,"ClosureSignalIndex:count":0}],_.a["#TagVariableChange"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["#TagVariable"]=_._["__tests__/template.marko_0_count/var"](_.b),(_.d).add(_.e),_.c),"__tests__/template.marko_1_count",5];M._.w()</script>
+  <button>0<!--M_*5 #text/1--></button><!--M_*5 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={},"ClosureScopes:count":_.d=new Set},_.a,2,_.e={_:_.b,"ClosureSignalIndex:count":0}],_.a["#TagVariableChange"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["#TagVariable"]=_._["__tests__/template.marko_0_count/var"](_.b),(_.d).add(_.e),_.c),"__tests__/template.marko_1_count 5"];M._.w()</script>
 ```
 
 # Render End
@@ -28,8 +28,7 @@
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.b), (_.d).add(_.e), _.c),
-        "__tests__/template.marko_1_count",
-        5
+        "__tests__/template.marko_1_count 5"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/resume.expected.md
index f3ede3248..5939441dd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/resume.expected.md
@@ -37,8 +37,7 @@
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x_y",
-        2
+        "__tests__/tags/custom-tag.marko_0_x_y 2"
       ];
       M._.w()
     </script>
@@ -93,8 +92,7 @@ container.querySelector("button").click();
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x_y",
-        2
+        "__tests__/tags/custom-tag.marko_0_x_y 2"
       ];
       M._.w()
     </script>
@@ -152,8 +150,7 @@ container.querySelector("button").click();
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x_y",
-        2
+        "__tests__/tags/custom-tag.marko_0_x_y 2"
       ];
       M._.w()
     </script>
@@ -211,8 +208,7 @@ container.querySelector("button").click();
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x_y",
-        2
+        "__tests__/tags/custom-tag.marko_0_x_y 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
index a14cbd197..1931e9417 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=inc>1<!--M_*2 #text/1-->,<!>10<!--M_*2 #text/2--></button><!--M_*2 #button/0--><!--M_[--><div>Counts: <!>1<!--M_*3 #text/0-->,<!>10<!--M_*3 #text/1--></div><!--M_]2 #text/3 3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,1,_.a={"ConditionalRenderer:#text/3":"__tests__/template.marko_1_content",input_content:_.c={},x:1,y:10},{}],_.a.input_content=_._["__tests__/template.marko_1_content"](_.c),_.b),"__tests__/tags/custom-tag.marko_0_x_y",2];M._.w()</script>
+  <button class=inc>1<!--M_*2 #text/1-->,<!>10<!--M_*2 #text/2--></button><!--M_*2 #button/0--><!--M_[--><div>Counts: <!>1<!--M_*3 #text/0-->,<!>10<!--M_*3 #text/1--></div><!--M_]2 #text/3 3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,1,_.a={"ConditionalRenderer:#text/3":"__tests__/template.marko_1_content",input_content:_.c={},x:1,y:10},{}],_.a.input_content=_._["__tests__/template.marko_1_content"](_.c),_.b),"__tests__/tags/custom-tag.marko_0_x_y 2"];M._.w()</script>
 ```
 
 # Render End
@@ -42,8 +42,7 @@
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x_y",
-        2
+        "__tests__/tags/custom-tag.marko_0_x_y 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/resume.expected.md
index 65e86a328..7c5c3088c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/resume.expected.md
@@ -33,8 +33,7 @@
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x",
-        2
+        "__tests__/tags/custom-tag.marko_0_x 2"
       ];
       M._.w()
     </script>
@@ -85,8 +84,7 @@ container.querySelector("button").click();
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x",
-        2
+        "__tests__/tags/custom-tag.marko_0_x 2"
       ];
       M._.w()
     </script>
@@ -138,8 +136,7 @@ container.querySelector("button").click();
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x",
-        2
+        "__tests__/tags/custom-tag.marko_0_x 2"
       ];
       M._.w()
     </script>
@@ -191,8 +188,7 @@ container.querySelector("button").click();
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x",
-        2
+        "__tests__/tags/custom-tag.marko_0_x 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md
index 99f2fa222..888685076 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_[--><div>Count (<!>hello<!--M_*3 #text/0-->): <!>1<!--M_*3 #text/1--></div><!--M_]2 #text/2 3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,1,_.a={"ConditionalRenderer:#text/2":"__tests__/template.marko_1_content",input_content:_.c={},input_name:"hello",x:1},{}],_.a.input_content=_._["__tests__/template.marko_1_content"](_.c),_.b),"__tests__/tags/custom-tag.marko_0_x",2];M._.w()</script>
+  <button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_[--><div>Count (<!>hello<!--M_*3 #text/0-->): <!>1<!--M_*3 #text/1--></div><!--M_]2 #text/2 3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,1,_.a={"ConditionalRenderer:#text/2":"__tests__/template.marko_1_content",input_content:_.c={},input_name:"hello",x:1},{}],_.a.input_content=_._["__tests__/template.marko_1_content"](_.c),_.b),"__tests__/tags/custom-tag.marko_0_x 2"];M._.w()</script>
 ```
 
 # Render End
@@ -38,8 +38,7 @@
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x",
-        2
+        "__tests__/tags/custom-tag.marko_0_x 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/resume.expected.md
index 708ae4123..2c3701e02 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/resume.expected.md
@@ -28,8 +28,7 @@
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x",
-        2
+        "__tests__/tags/custom-tag.marko_0_x 2"
       ];
       M._.w()
     </script>
@@ -75,8 +74,7 @@ container.querySelector("button").click();
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x",
-        2
+        "__tests__/tags/custom-tag.marko_0_x 2"
       ];
       M._.w()
     </script>
@@ -123,8 +121,7 @@ container.querySelector("button").click();
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x",
-        2
+        "__tests__/tags/custom-tag.marko_0_x 2"
       ];
       M._.w()
     </script>
@@ -171,8 +168,7 @@ container.querySelector("button").click();
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x",
-        2
+        "__tests__/tags/custom-tag.marko_0_x 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md
index 73208c0ad..db739c597 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_[--><div>Count: <!>1<!--M_*3 #text/0--></div><!--M_]2 #text/2 3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,1,_.a={"ConditionalRenderer:#text/2":"__tests__/template.marko_1_content",input_content:_.c={},x:1},{}],_.a.input_content=_._["__tests__/template.marko_1_content"](_.c),_.b),"__tests__/tags/custom-tag.marko_0_x",2];M._.w()</script>
+  <button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_[--><div>Count: <!>1<!--M_*3 #text/0--></div><!--M_]2 #text/2 3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,1,_.a={"ConditionalRenderer:#text/2":"__tests__/template.marko_1_content",input_content:_.c={},x:1},{}],_.a.input_content=_._["__tests__/template.marko_1_content"](_.c),_.b),"__tests__/tags/custom-tag.marko_0_x 2"];M._.w()</script>
 ```
 
 # Render End
@@ -33,8 +33,7 @@
         {}], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.c), _.b),
-        "__tests__/tags/custom-tag.marko_0_x",
-        2
+        "__tests__/tags/custom-tag.marko_0_x 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/resume.expected.md
index d34998bcc..91b178c6a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/resume.expected.md
@@ -36,12 +36,7 @@
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.c), _.b),
-        "__tests__/tags/counter.marko_0_x",
-        2,
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -91,12 +86,7 @@ container.querySelector("button.inc-child").click();
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.c), _.b),
-        "__tests__/tags/counter.marko_0_x",
-        2,
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -151,12 +141,7 @@ container.querySelector("button.inc-parent").click();
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.c), _.b),
-        "__tests__/tags/counter.marko_0_x",
-        2,
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -211,12 +196,7 @@ container.querySelector("button.reset").click();
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.c), _.b),
-        "__tests__/tags/counter.marko_0_x",
-        2,
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/ssr.expected.md
index 0069623da..a51e658b7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=inc-child>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><button class=inc-parent>1<!--M_*1 #text/3--></button><!--M_*1 #button/2--><button class=reset>reset</button><!--M_*1 #button/4--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"#scopeOffset/1":3,count:1,"#childScope/0":_.a={x:1}},_.a],_.a["#TagVariableChange"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["#TagVariable"]=_._["__tests__/template.marko_0_count/var"](_.c),_.b),"__tests__/tags/counter.marko_0_x",2,"__tests__/template.marko_0",1,"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button class=inc-child>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><button class=inc-parent>1<!--M_*1 #text/3--></button><!--M_*1 #button/2--><button class=reset>reset</button><!--M_*1 #button/4--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"#scopeOffset/1":3,count:1,"#childScope/0":_.a={x:1}},_.a],_.a["#TagVariableChange"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["#TagVariable"]=_._["__tests__/template.marko_0_count/var"](_.c),_.b),"__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1 __tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -41,12 +41,7 @@
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.c), _.b),
-        "__tests__/tags/counter.marko_0_x",
-        2,
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/resume.expected.md
index 5b9c55e35..a3e11501f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/resume.expected.md
@@ -26,8 +26,7 @@
         }, _.a], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_data/var"
           ](_.c), _.b),
-        "__tests__/tags/child.marko_0_x",
-        2
+        "__tests__/tags/child.marko_0_x 2"
       ];
       M._.w()
     </script>
@@ -67,8 +66,7 @@ container.querySelector("button.inc").click();
         }, _.a], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_data/var"
           ](_.c), _.b),
-        "__tests__/tags/child.marko_0_x",
-        2
+        "__tests__/tags/child.marko_0_x 2"
       ];
       M._.w()
     </script>
@@ -113,8 +111,7 @@ container.querySelector("button.inc").click();
         }, _.a], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_data/var"
           ](_.c), _.b),
-        "__tests__/tags/child.marko_0_x",
-        2
+        "__tests__/tags/child.marko_0_x 2"
       ];
       M._.w()
     </script>
@@ -159,8 +156,7 @@ container.querySelector("button.inc").click();
         }, _.a], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_data/var"
           ](_.c), _.b),
-        "__tests__/tags/child.marko_0_x",
-        2
+        "__tests__/tags/child.marko_0_x 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/ssr.expected.md
index 3804bb4a3..22d0721c4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=inc>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><div>Marko 1<!--M_*1 #text/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"#scopeOffset/1":3,name:"Marko","#childScope/0":_.a={input_extra:1,x:0}},_.a],_.a["#TagVariable"]=_._["__tests__/template.marko_0_data/var"](_.c),_.b),"__tests__/tags/child.marko_0_x",2];M._.w()</script>
+  <button class=inc>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><div>Marko 1<!--M_*1 #text/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"#scopeOffset/1":3,name:"Marko","#childScope/0":_.a={input_extra:1,x:0}},_.a],_.a["#TagVariable"]=_._["__tests__/template.marko_0_data/var"](_.c),_.b),"__tests__/tags/child.marko_0_x 2"];M._.w()</script>
 ```
 
 # Render End
@@ -31,8 +31,7 @@
         }, _.a], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_data/var"
           ](_.c), _.b),
-        "__tests__/tags/child.marko_0_x",
-        2
+        "__tests__/tags/child.marko_0_x 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/resume.expected.md
index 01c429efd..ff66c5e86 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/resume.expected.md
@@ -24,8 +24,7 @@
         }, _.a], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_data/var"
           ](_.c), _.b),
-        "__tests__/tags/child.marko_0_x",
-        2
+        "__tests__/tags/child.marko_0_x 2"
       ];
       M._.w()
     </script>
@@ -63,8 +62,7 @@ container.querySelector("button.inc").click();
         }, _.a], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_data/var"
           ](_.c), _.b),
-        "__tests__/tags/child.marko_0_x",
-        2
+        "__tests__/tags/child.marko_0_x 2"
       ];
       M._.w()
     </script>
@@ -107,8 +105,7 @@ container.querySelector("button.inc").click();
         }, _.a], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_data/var"
           ](_.c), _.b),
-        "__tests__/tags/child.marko_0_x",
-        2
+        "__tests__/tags/child.marko_0_x 2"
       ];
       M._.w()
     </script>
@@ -151,8 +148,7 @@ container.querySelector("button.inc").click();
         }, _.a], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_data/var"
           ](_.c), _.b),
-        "__tests__/tags/child.marko_0_x",
-        2
+        "__tests__/tags/child.marko_0_x 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/ssr.expected.md
index 5e0f4a11b..3c1807a99 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><div>1<!--M_*1 #text/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"#scopeOffset/1":3,"#childScope/0":_.a={x:1}},_.a],_.a["#TagVariable"]=_._["__tests__/template.marko_0_data/var"](_.c),_.b),"__tests__/tags/child.marko_0_x",2];M._.w()</script>
+  <button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><div>1<!--M_*1 #text/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"#scopeOffset/1":3,"#childScope/0":_.a={x:1}},_.a],_.a["#TagVariable"]=_._["__tests__/template.marko_0_data/var"](_.c),_.b),"__tests__/tags/child.marko_0_x 2"];M._.w()</script>
 ```
 
 # Render End
@@ -29,8 +29,7 @@
         }, _.a], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_data/var"
           ](_.c), _.b),
-        "__tests__/tags/child.marko_0_x",
-        2
+        "__tests__/tags/child.marko_0_x 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/resume.expected.md
index 242068ded..40082ae87 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/resume.expected.md
@@ -24,8 +24,7 @@
             "ConditionalRenderer:#text/1": "__tests__/template.marko_1_content"
           }
         }, _.a]),
-        "__tests__/template.marko_0_selected",
-        1
+        "__tests__/template.marko_0_selected 1"
       ];
       M._.w()
     </script>
@@ -69,8 +68,7 @@ container.querySelector("button").click();
             "ConditionalRenderer:#text/1": "__tests__/template.marko_1_content"
           }
         }, _.a]),
-        "__tests__/template.marko_0_selected",
-        1
+        "__tests__/template.marko_0_selected 1"
       ];
       M._.w()
     </script>
@@ -114,8 +112,7 @@ container.querySelector("button").click();
             "ConditionalRenderer:#text/1": "__tests__/template.marko_1_content"
           }
         }, _.a]),
-        "__tests__/template.marko_0_selected",
-        1
+        "__tests__/template.marko_0_selected 1"
       ];
       M._.w()
     </script>
@@ -159,8 +156,7 @@ container.querySelector("button").click();
             "ConditionalRenderer:#text/1": "__tests__/template.marko_1_content"
           }
         }, _.a]),
-        "__tests__/template.marko_0_selected",
-        1
+        "__tests__/template.marko_0_selected 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/ssr.expected.md
index 9c6f39f98..0bd817b3a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><!--M_[--><span>The thing</span><!--M_]2 #text/1 3--></div><!--M_*2 #div/0--><button>Toggle</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{selected:!1,"#childScope/0":_.a={"ConditionalRenderer:#text/1":"__tests__/template.marko_1_content"}},_.a]),"__tests__/template.marko_0_selected",1];M._.w()</script>
+  <div><!--M_[--><span>The thing</span><!--M_]2 #text/1 3--></div><!--M_*2 #div/0--><button>Toggle</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{selected:!1,"#childScope/0":_.a={"ConditionalRenderer:#text/1":"__tests__/template.marko_1_content"}},_.a]),"__tests__/template.marko_0_selected 1"];M._.w()</script>
 ```
 
 # Render End
@@ -29,8 +29,7 @@
             "ConditionalRenderer:#text/1": "__tests__/template.marko_1_content"
           }
         }, _.a]),
-        "__tests__/template.marko_0_selected",
-        1
+        "__tests__/template.marko_0_selected 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/resume.expected.md
index 47f1c4cf2..f9c7cc3d2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/resume.expected.md
@@ -18,8 +18,7 @@
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -51,8 +50,7 @@ container.querySelector("button").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -89,8 +87,7 @@ container.querySelector("button").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -127,8 +124,7 @@ container.querySelector("button").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/ssr.expected.md
index d2ac70ac6..76398c3c8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>{"foo":1,"bar":2}<!--M_*1 #text/0--></div><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:1}]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <div>{"foo":1,"bar":2}<!--M_*1 #text/0--></div><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:1}]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -23,8 +23,7 @@
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/resume.expected.md
index 484b85261..de64e0cbf 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/resume.expected.md
@@ -21,8 +21,7 @@
           x: 1,
           "#childScope/0": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -57,8 +56,7 @@ container.querySelector("button").click();
           x: 1,
           "#childScope/0": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -98,8 +96,7 @@ container.querySelector("button").click();
           x: 1,
           "#childScope/0": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -139,8 +136,7 @@ container.querySelector("button").click();
           x: 1,
           "#childScope/0": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/ssr.expected.md
index 7a0f5a149..47d68ff80 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>1|Hello|<!>1<!--M_*2 #text/2--></div><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{x:1,"#childScope/0":_.a={}},_.a]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <div>1|Hello|<!>1<!--M_*2 #text/2--></div><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{x:1,"#childScope/0":_.a={}},_.a]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -26,8 +26,7 @@
           x: 1,
           "#childScope/0": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/resume.expected.md
index 5d222b2b9..06276876f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
           x: 1,
           "#childScope/0": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -53,8 +52,7 @@ container.querySelector("button").click();
           x: 1,
           "#childScope/0": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -92,8 +90,7 @@ container.querySelector("button").click();
           x: 1,
           "#childScope/0": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -131,8 +128,7 @@ container.querySelector("button").click();
           x: 1,
           "#childScope/0": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/ssr.expected.md
index 428cab698..5744f1b7c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>1<!--M_*2 #text/0--></div><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{x:1,"#childScope/0":_.a={}},_.a]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <div>1<!--M_*2 #text/0--></div><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{x:1,"#childScope/0":_.a={}},_.a]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -24,8 +24,7 @@
           x: 1,
           "#childScope/0": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/resume.expected.md
index e9914434a..99fae8ff1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/resume.expected.md
@@ -32,8 +32,7 @@
           "ClosureSignalIndex:x": 0,
           "#ClosestBranchId": 3
         }], (_.c).add(_.d), _.c.add(_.e), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -83,8 +82,7 @@ container.querySelector("button").click();
           "ClosureSignalIndex:x": 0,
           "#ClosestBranchId": 3
         }], (_.c).add(_.d), _.c.add(_.e), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -140,8 +138,7 @@ container.querySelector("button").click();
           "ClosureSignalIndex:x": 0,
           "#ClosestBranchId": 3
         }], (_.c).add(_.d), _.c.add(_.e), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -193,8 +190,7 @@ container.querySelector("button").click();
           "ClosureSignalIndex:x": 0,
           "#ClosestBranchId": 3
         }], (_.c).add(_.d), _.c.add(_.e), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/ssr.expected.md
index d2a7fad9b..150f49bec 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>1<!--M_*2 #text/0--></div><!--M_[--><div>1<!--M_*4 #text/0--></div><!--M_]1 #text/1 3--><button>1<!--M_*1 #text/3--></button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={x:1,"ClosureScopes:x":_.c=new Set},_.d={_:_.a,"ClosureSignalIndex:x":0},{},_.e={_:_.a,"ClosureSignalIndex:x":0,"#ClosestBranchId":3}],(_.c).add(_.d),_.c.add(_.e),_.b),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <div>1<!--M_*2 #text/0--></div><!--M_[--><div>1<!--M_*4 #text/0--></div><!--M_]1 #text/1 3--><button>1<!--M_*1 #text/3--></button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={x:1,"ClosureScopes:x":_.c=new Set},_.d={_:_.a,"ClosureSignalIndex:x":0},{},_.e={_:_.a,"ClosureSignalIndex:x":0,"#ClosestBranchId":3}],(_.c).add(_.d),_.c.add(_.e),_.b),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -37,8 +37,7 @@
           "ClosureSignalIndex:x": 0,
           "#ClosestBranchId": 3
         }], (_.c).add(_.d), _.c.add(_.e), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-conditional/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-conditional/__snapshots__/resume.expected.md
index fd6195f2d..b870b1fc7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-conditional/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-conditional/__snapshots__/resume.expected.md
@@ -25,8 +25,7 @@
           _: _.a,
           "#childScope/0": _.b = {}
         }, _.b]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -69,8 +68,7 @@ container.querySelector("button").click();
           _: _.a,
           "#childScope/0": _.b = {}
         }, _.b]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -116,8 +114,7 @@ container.querySelector("button").click();
           _: _.a,
           "#childScope/0": _.b = {}
         }, _.b]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -159,8 +156,7 @@ container.querySelector("button").click();
           _: _.a,
           "#childScope/0": _.b = {}
         }, _.b]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-conditional/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-conditional/__snapshots__/ssr.expected.md
index eeb52a5ce..35d8dbe54 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-conditional/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-conditional/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[--><div>Hello <!>1<!--M_*3 #text/0--></div><!--M_]1 #text/0 2--><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={x:1},{_:_.a,"#childScope/0":_.b={}},_.b]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <!--M_[--><div>Hello <!>1<!--M_*3 #text/0--></div><!--M_]1 #text/0 2--><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={x:1},{_:_.a,"#childScope/0":_.b={}},_.b]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -30,8 +30,7 @@
           _: _.a,
           "#childScope/0": _.b = {}
         }, _.b]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-stateful/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-stateful/__snapshots__/resume.expected.md
index c125cc30d..d44ce84d9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-stateful/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-stateful/__snapshots__/resume.expected.md
@@ -21,8 +21,7 @@
           count: 0,
           "#childScope/2": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -57,8 +56,7 @@ container.querySelector("button").click();
           count: 0,
           "#childScope/2": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -98,8 +96,7 @@ container.querySelector("button").click();
           count: 0,
           "#childScope/2": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -139,8 +136,7 @@ container.querySelector("button").click();
           count: 0,
           "#childScope/2": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-stateful/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-stateful/__snapshots__/ssr.expected.md
index e7687c06e..af4c46fab 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-stateful/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-stateful/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><div>Hello Ryan <!>0<!--M_*2 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{count:0,"#childScope/2":_.a={}},_.a]),"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><div>Hello Ryan <!>0<!--M_*2 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{count:0,"#childScope/2":_.a={}},_.a]),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -26,8 +26,7 @@
           count: 0,
           "#childScope/2": _.a = {}
         }, _.a]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/resume.expected.md
index 83015cf14..91311660d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/resume.expected.md
@@ -20,8 +20,7 @@
         {
           y: 1
         }]),
-        "__tests__/template.marko_1_y",
-        2
+        "__tests__/template.marko_1_y 2"
       ];
       M._.w()
     </script>
@@ -55,8 +54,7 @@ container.querySelector("button").click();
         {
           y: 1
         }]),
-        "__tests__/template.marko_1_y",
-        2
+        "__tests__/template.marko_1_y 2"
       ];
       M._.w()
     </script>
@@ -95,8 +93,7 @@ container.querySelector("button").click();
         {
           y: 1
         }]),
-        "__tests__/template.marko_1_y",
-        2
+        "__tests__/template.marko_1_y 2"
       ];
       M._.w()
     </script>
@@ -135,8 +132,7 @@ container.querySelector("button").click();
         {
           y: 1
         }]),
-        "__tests__/template.marko_1_y",
-        2
+        "__tests__/template.marko_1_y 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/ssr.expected.md
index 8d8091f83..dcbed7b9c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>Hello Ryan <!>1<!--M_*2 #text/1--></div><button>1<!--M_*2 #text/3--></button><!--M_*2 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,1,{y:1}]),"__tests__/template.marko_1_y",2];M._.w()</script>
+  <div>Hello Ryan <!>1<!--M_*2 #text/1--></div><button>1<!--M_*2 #text/3--></button><!--M_*2 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,1,{y:1}]),"__tests__/template.marko_1_y 2"];M._.w()</script>
 ```
 
 # Render End
@@ -25,8 +25,7 @@
         {
           y: 1
         }]),
-        "__tests__/template.marko_1_y",
-        2
+        "__tests__/template.marko_1_y 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/destructure-stateful-upstream-alias/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/destructure-stateful-upstream-alias/__snapshots__/resume.expected.md
index 4b8acc502..307f6e360 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/destructure-stateful-upstream-alias/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/destructure-stateful-upstream-alias/__snapshots__/resume.expected.md
@@ -35,8 +35,7 @@
           ](_.b), _.b["#TagVariable"] = _._[
           "__tests__/template.marko_0_store/var"
           ](_.a), _.c),
-        "__tests__/template.marko_0_clear",
-        1
+        "__tests__/template.marko_0_clear 1"
       ];
       M._.w()
     </script>
@@ -77,8 +76,7 @@ container.querySelector("button").click();
           ](_.b), _.b["#TagVariable"] = _._[
           "__tests__/template.marko_0_store/var"
           ](_.a), _.c),
-        "__tests__/template.marko_0_clear",
-        1
+        "__tests__/template.marko_0_clear 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/destructure-stateful-upstream-alias/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/destructure-stateful-upstream-alias/__snapshots__/ssr.expected.md
index 09f283775..bbc9c0e36 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/destructure-stateful-upstream-alias/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/destructure-stateful-upstream-alias/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Clear</button><!--M_*1 #button/2--><ul><li>Learn Marko<!--M_*4 #text/0--></li><li>Make a Website<!--M_*5 #text/0--></li><!--M_}1 #ul/3 5 4--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"#scopeOffset/1":3,clear:_.b={},"#childScope/0":_.b},_.b,1,{"#LoopKey":0},{"#LoopKey":1}],_.a.clear=_._["__tests__/tags/store.marko_0/_return2"](_.b),_.b["#TagVariable"]=_._["__tests__/template.marko_0_store/var"](_.a),_.c),"__tests__/template.marko_0_clear",1];M._.w()</script>
+  <button>Clear</button><!--M_*1 #button/2--><ul><li>Learn Marko<!--M_*4 #text/0--></li><li>Make a Website<!--M_*5 #text/0--></li><!--M_}1 #ul/3 5 4--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"#scopeOffset/1":3,clear:_.b={},"#childScope/0":_.b},_.b,1,{"#LoopKey":0},{"#LoopKey":1}],_.a.clear=_._["__tests__/tags/store.marko_0/_return2"](_.b),_.b["#TagVariable"]=_._["__tests__/template.marko_0_store/var"](_.a),_.c),"__tests__/template.marko_0_clear 1"];M._.w()</script>
 ```
 
 # Render End
@@ -40,8 +40,7 @@
           ](_.b), _.b["#TagVariable"] = _._[
           "__tests__/template.marko_0_store/var"
           ](_.a), _.c),
-        "__tests__/template.marko_0_clear",
-        1
+        "__tests__/template.marko_0_clear 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/resume.expected.md
index 869d4a92b..07c797e30 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/resume.expected.md
@@ -27,8 +27,7 @@
           show: !1
         },
         {}]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -65,8 +64,7 @@ container.querySelector("button").click();
           show: !1
         },
         {}]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -114,8 +112,7 @@ container.querySelector("button").click();
           show: !1
         },
         {}]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -160,8 +157,7 @@ container.querySelector("button").click();
           show: !1
         },
         {}]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/ssr.expected.md
index 2953b90c0..7813e862a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><!--M_|1 #text/0--><span class=hidden>1</span><!--M_|1 #text/1 2--><button>Toggle</button><!--M_*1 #button/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[{x:1},{show:!1},{}]),"__tests__/template.marko_0_show",1];M._.w()</script>
+  <div><!--M_|1 #text/0--><span class=hidden>1</span><!--M_|1 #text/1 2--><button>Toggle</button><!--M_*1 #button/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[{x:1},{show:!1},{}]),"__tests__/template.marko_0_show 1"];M._.w()</script>
 ```
 
 # Render End
@@ -31,8 +31,7 @@
           show: !1
         },
         {}]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/resume.expected.md
index a59e5fe8b..1899a69ee 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/resume.expected.md
@@ -30,8 +30,7 @@
           _: _.b,
           "ClosureSignalIndex:c": 1
         }], (_.d).add(_.e), _.d.add(_.f), _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -75,8 +74,7 @@ container.querySelector("button").click();
           _: _.b,
           "ClosureSignalIndex:c": 1
         }], (_.d).add(_.e), _.d.add(_.f), _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/ssr.expected.md
index 9e4ff4311..b32ad04d8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button></button><!--M_*1 #button/0--><div>1 2 <!>3<!--M_*3 #text/2--></div><div>1 2 <!>3<!--M_*5 #text/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"ClosureScopes:c":_.d=new Set},1,_.e={_:_.a,"ClosureSignalIndex:c":0},_.b={_:_.a},_.f={_:_.b,"ClosureSignalIndex:c":1}],(_.d).add(_.e),_.d.add(_.f),_.c),"__tests__/template.marko_0",1];M._.w()</script>
+  <button></button><!--M_*1 #button/0--><div>1 2 <!>3<!--M_*3 #text/2--></div><div>1 2 <!>3<!--M_*5 #text/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"ClosureScopes:c":_.d=new Set},1,_.e={_:_.a,"ClosureSignalIndex:c":0},_.b={_:_.a},_.f={_:_.b,"ClosureSignalIndex:c":1}],(_.d).add(_.e),_.d.add(_.f),_.c),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -35,8 +35,7 @@
           _: _.b,
           "ClosureSignalIndex:c": 1
         }], (_.d).add(_.e), _.d.add(_.f), _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-content-attr/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-content-attr/__snapshots__/resume.expected.md
index e07634a27..fa3247c1c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-content-attr/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-content-attr/__snapshots__/resume.expected.md
@@ -22,8 +22,7 @@
         }, _.b], _.b._ = _.a, _.c.content = _._[
           "__tests__/template.marko_1_content"
           ](_.a), (_.e).add(_.b), _.d),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -59,8 +58,7 @@ container.querySelector("button").click();
         }, _.b], _.b._ = _.a, _.c.content = _._[
           "__tests__/template.marko_1_content"
           ](_.a), (_.e).add(_.b), _.d),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -100,8 +98,7 @@ container.querySelector("button").click();
         }, _.b], _.b._ = _.a, _.c.content = _._[
           "__tests__/template.marko_1_content"
           ](_.a), (_.e).add(_.b), _.d),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-content-attr/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-content-attr/__snapshots__/ssr.expected.md
index 11b196a7e..6ec4f890c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-content-attr/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-content-attr/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*2 #text/0--> 3</button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.a={"BranchScopes:#button/0":_.b={"ClosureSignalIndex:count":0},"ConditionalRenderer:#button/0":"__tests__/template.marko_1_content",count:0,MyThing:_.c={},"ClosureScopes:count":_.e=new Set},_.b],_.b._=_.a,_.c.content=_._["__tests__/template.marko_1_content"](_.a),(_.e).add(_.b),_.d),"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button>0<!--M_*2 #text/0--> 3</button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.a={"BranchScopes:#button/0":_.b={"ClosureSignalIndex:count":0},"ConditionalRenderer:#button/0":"__tests__/template.marko_1_content",count:0,MyThing:_.c={},"ClosureScopes:count":_.e=new Set},_.b],_.b._=_.a,_.c.content=_._["__tests__/template.marko_1_content"](_.a),(_.e).add(_.b),_.d),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -27,8 +27,7 @@
         }, _.b], _.b._ = _.a, _.c.content = _._[
           "__tests__/template.marko_1_content"
           ](_.a), (_.e).add(_.b), _.d),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/resume.expected.md
index a126ff3fb..e8d62b702 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/resume.expected.md
@@ -14,8 +14,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -43,8 +42,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -76,8 +74,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -109,8 +106,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/ssr.expected.md
index 14dc1caa2..c43c89ea6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{clickCount:0}]),"__tests__/template.marko_0_clickCount",1];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{clickCount:0}]),"__tests__/template.marko_0_clickCount 1"];M._.w()</script>
 ```
 
 # Render End
@@ -19,8 +19,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/resume.expected.md
index 7e5848086..e098f3d16 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/resume.expected.md
@@ -24,8 +24,7 @@
         {
           "ConditionalRenderer:#span/0": "__tests__/template.marko_1_content"
         }]),
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
@@ -65,8 +64,7 @@ container.querySelector("button").click();
         {
           "ConditionalRenderer:#span/0": "__tests__/template.marko_1_content"
         }]),
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
@@ -109,8 +107,7 @@ container.querySelector("button").click();
         {
           "ConditionalRenderer:#span/0": "__tests__/template.marko_1_content"
         }]),
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/ssr.expected.md
index ae4bc3f03..6db6d1fbf 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <span class=A><!--M_[-->body content<!--M_]2 #span/0 3--></span><!--M_'1 #text/0 2--><button></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/0":"span",tagName:"span",className:"A"},{"ConditionalRenderer:#span/0":"__tests__/template.marko_1_content"}]),"__tests__/template.marko_0_tagName",1];M._.w()</script>
+  <span class=A><!--M_[-->body content<!--M_]2 #span/0 3--></span><!--M_'1 #text/0 2--><button></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/0":"span",tagName:"span",className:"A"},{"ConditionalRenderer:#span/0":"__tests__/template.marko_1_content"}]),"__tests__/template.marko_0_tagName 1"];M._.w()</script>
 ```
 
 # Render End
@@ -29,8 +29,7 @@
         {
           "ConditionalRenderer:#span/0": "__tests__/template.marko_1_content"
         }]),
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-tag-events/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-tag-events/__snapshots__/resume.expected.md
index 5bed06d49..688d43ebf 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-tag-events/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-tag-events/__snapshots__/resume.expected.md
@@ -23,7 +23,7 @@
         "#Renderer": "span"
       }], _.a.click = _._[
         "__tests__/template.marko_0/onClick"
-        ](_.c), _.b), "_dynamicTagScript", 2];
+        ](_.c), _.b), "_dynamicTagScript 2"];
       M._.w()
     </script>
   </body>
@@ -61,7 +61,7 @@ container.querySelector(".A").click();
         "#Renderer": "span"
       }], _.a.click = _._[
         "__tests__/template.marko_0/onClick"
-        ](_.c), _.b), "_dynamicTagScript", 2];
+        ](_.c), _.b), "_dynamicTagScript 2"];
       M._.w()
     </script>
   </body>
@@ -102,7 +102,7 @@ container.querySelector(".A").click();
         "#Renderer": "span"
       }], _.a.click = _._[
         "__tests__/template.marko_0/onClick"
-        ](_.c), _.b), "_dynamicTagScript", 2];
+        ](_.c), _.b), "_dynamicTagScript 2"];
       M._.w()
     </script>
   </body>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-tag-events/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-tag-events/__snapshots__/ssr.expected.md
index 50d701197..0efa7b279 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-tag-events/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-tag-events/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <span class=A><!--M_[-->body content<!--M_]2 #span/0 3--></span><!--M_'1 #text/0 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"ConditionalRenderer:#text/0":"span",tagName:"span"},{"EventAttributes:#span/0":_.a={},"ConditionalRenderer:#span/0":"__tests__/template.marko_1_content","#Renderer":"span"}],_.a.click=_._["__tests__/template.marko_0/onClick"](_.c),_.b),"_dynamicTagScript",2];M._.w()</script>
+  <span class=A><!--M_[-->body content<!--M_]2 #span/0 3--></span><!--M_'1 #text/0 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"ConditionalRenderer:#text/0":"span",tagName:"span"},{"EventAttributes:#span/0":_.a={},"ConditionalRenderer:#span/0":"__tests__/template.marko_1_content","#Renderer":"span"}],_.a.click=_._["__tests__/template.marko_0/onClick"](_.c),_.b),"_dynamicTagScript 2"];M._.w()</script>
 ```
 
 # Render End
@@ -28,7 +28,7 @@
         "#Renderer": "span"
       }], _.a.click = _._[
         "__tests__/template.marko_0/onClick"
-        ](_.c), _.b), "_dynamicTagScript", 2];
+        ](_.c), _.b), "_dynamicTagScript 2"];
       M._.w()
     </script>
   </body>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/resume.expected.md
index e8fde36c7..c31a28fec 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/resume.expected.md
@@ -33,8 +33,7 @@
         }, _.a = {}], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_y/var"
           ](_.c), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -85,8 +84,7 @@ container.querySelector("button").click();
         }, _.a = {}], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_y/var"
           ](_.c), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -139,8 +137,7 @@ container.querySelector("button").click();
         }, _.a = {}], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_y/var"
           ](_.c), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -193,8 +190,7 @@ container.querySelector("button").click();
         }, _.a = {}], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_y/var"
           ](_.c), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/ssr.expected.md
index 1cf2502cc..ceaa31000 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Count: <!>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[--><div>Child: <!>1<!--M_*2 #text/0--></div><!--M_]1 #text/2 2--><div>Parent: <!>1<!--M_*1 #text/4--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"ConditionalRenderer:#text/2":"__tests__/tags/custom-tag.marko","#scopeOffset/3":3,x:1},_.a={}],_.a["#TagVariable"]=_._["__tests__/template.marko_0_y/var"](_.c),_.b),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <button>Count: <!>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[--><div>Child: <!>1<!--M_*2 #text/0--></div><!--M_]1 #text/2 2--><div>Parent: <!>1<!--M_*1 #text/4--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"ConditionalRenderer:#text/2":"__tests__/tags/custom-tag.marko","#scopeOffset/3":3,x:1},_.a={}],_.a["#TagVariable"]=_._["__tests__/template.marko_0_y/var"](_.c),_.b),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -38,8 +38,7 @@
         }, _.a = {}], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_y/var"
           ](_.c), _.b),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/resume.expected.md
index 3d634725c..d534beb7d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/resume.expected.md
@@ -33,8 +33,7 @@
           x: 1
         },
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -85,8 +84,7 @@ container.querySelector("button").click();
           x: 1
         },
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -138,8 +136,7 @@ container.querySelector("button").click();
           x: 1
         },
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -191,8 +188,7 @@ container.querySelector("button").click();
           x: 1
         },
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md
index 9a57a0a21..ecd3085f8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Count: <!>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[--><div>1<!--M_*2 #text/0--></div><!--M_]1 #text/2 2--><div>false</div><div>true</div><div>"spread1"</div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/2":"__tests__/tags/custom-tag.marko",x:1},{}]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <button>Count: <!>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[--><div>1<!--M_*2 #text/0--></div><!--M_]1 #text/2 2--><div>false</div><div>true</div><div>"spread1"</div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/2":"__tests__/tags/custom-tag.marko",x:1},{}]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -38,8 +38,7 @@
           x: 1
         },
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/resume.expected.md
index d37dedda1..b9f8f11c5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/resume.expected.md
@@ -17,8 +17,7 @@
         {
           className: "A"
         }]),
-        "__tests__/template.marko_0_className",
-        1
+        "__tests__/template.marko_0_className 1"
       ];
       M._.w()
     </script>
@@ -49,8 +48,7 @@ container.querySelector("button").click();
         {
           className: "A"
         }]),
-        "__tests__/template.marko_0_className",
-        1
+        "__tests__/template.marko_0_className 1"
       ];
       M._.w()
     </script>
@@ -85,8 +83,7 @@ container.querySelector("button").click();
         {
           className: "A"
         }]),
-        "__tests__/template.marko_0_className",
-        1
+        "__tests__/template.marko_0_className 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/ssr.expected.md
index 5773900b9..b2b6461d5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <p class=A>paragraph</p><!--M_*1 #p/0--><button></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{className:"A"}]),"__tests__/template.marko_0_className",1];M._.w()</script>
+  <p class=A>paragraph</p><!--M_*1 #p/0--><button></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{className:"A"}]),"__tests__/template.marko_0_className 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
         {
           className: "A"
         }]),
-        "__tests__/template.marko_0_className",
-        1
+        "__tests__/template.marko_0_className 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md
index f60d0eba8..a9af79171 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md
@@ -23,8 +23,7 @@
             ]
         },
         {}]),
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
@@ -61,8 +60,7 @@ container.querySelector("button").click();
             ]
         },
         {}]),
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
@@ -103,8 +101,7 @@ container.querySelector("button").click();
             ]
         },
         {}]),
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md
index 3d33328e5..c2eaac7a0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button></button><!--M_*1 #button/0--><!--M_[--><div>Id is <!>dynamic<!--M_*2 #text/0--></div><!--M_]1 #text/1 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/1":"__tests__/tags/child.marko",tagName:_._["__tests__/tags/child.marko"]},{}]),"__tests__/template.marko_0_tagName",1];M._.w()</script>
+  <button></button><!--M_*1 #button/0--><!--M_[--><div>Id is <!>dynamic<!--M_*2 #text/0--></div><!--M_]1 #text/1 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/1":"__tests__/tags/child.marko",tagName:_._["__tests__/tags/child.marko"]},{}]),"__tests__/template.marko_0_tagName 1"];M._.w()</script>
 ```
 
 # Render End
@@ -28,8 +28,7 @@
             ]
         },
         {}]),
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md
index b165eaab6..7e08408a3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md
@@ -24,8 +24,7 @@
           val: 3
         },
         {}]),
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
@@ -65,8 +64,7 @@ container.querySelector("button").click();
           val: 3
         },
         {}]),
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
@@ -108,8 +106,7 @@ container.querySelector("button").click();
           val: 3
         },
         {}]),
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/ssr.expected.md
index 120ac88e8..e04e3b49f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[--><div>Child 1 has <!>3<!--M_*2 #text/0--></div><!--M_]1 #text/0 2--><button></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/0":"__tests__/tags/child1.marko",tagName:_._["__tests__/tags/child1.marko"],val:3},{}]),"__tests__/template.marko_0_tagName",1];M._.w()</script>
+  <!--M_[--><div>Child 1 has <!>3<!--M_*2 #text/0--></div><!--M_]1 #text/0 2--><button></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/0":"__tests__/tags/child1.marko",tagName:_._["__tests__/tags/child1.marko"],val:3},{}]),"__tests__/template.marko_0_tagName 1"];M._.w()</script>
 ```
 
 # Render End
@@ -29,8 +29,7 @@
           val: 3
         },
         {}]),
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-input-intersection/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-input-intersection/__snapshots__/resume.expected.md
index bc98fb5a6..31e0d5a61 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-input-intersection/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-input-intersection/__snapshots__/resume.expected.md
@@ -42,8 +42,7 @@
           ](_.d), _.b.inputContent = _._[
           "__tests__/template.marko_2_content"
           ](_.d), _.c),
-        "__tests__/tags/my-tag.marko_0_inputContent",
-        2, 5
+        "__tests__/tags/my-tag.marko_0_inputContent 2 5"
       ];
       M._.w()
     </script>
@@ -97,8 +96,7 @@ INSERT html/body/span/#text1
           ](_.d), _.b.inputContent = _._[
           "__tests__/template.marko_2_content"
           ](_.d), _.c),
-        "__tests__/tags/my-tag.marko_0_inputContent",
-        2, 5
+        "__tests__/tags/my-tag.marko_0_inputContent 2 5"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-input-intersection/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-input-intersection/__snapshots__/ssr.expected.md
index 9c5f918c2..41ccb3cad 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-input-intersection/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-input-intersection/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div class=foo><!--M_[-->default<!--M_]3 #div/0 4--></div><!--M_'2 #text/0 3--><span class=foo><!--M_[-->default<!--M_]6 #span/0 7--></span><!--M_'5 #text/0 6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,1,_.a={"ConditionalRenderer:#text/0":"div",inputContent:_.d={},htmlInput:{}},{"ConditionalRenderer:#div/0":"__tests__/tags/my-tag.marko_1_content"},1,_.b={"ConditionalRenderer:#text/0":"span",inputAs:"span",htmlInput:{}},{"ConditionalRenderer:#span/0":"__tests__/tags/my-tag.marko_1_content"}],_.a.inputContent=_._["__tests__/template.marko_1_content"](_.d),_.b.inputContent=_._["__tests__/template.marko_2_content"](_.d),_.c),"__tests__/tags/my-tag.marko_0_inputContent",2,5];M._.w()</script>
+  <div class=foo><!--M_[-->default<!--M_]3 #div/0 4--></div><!--M_'2 #text/0 3--><span class=foo><!--M_[-->default<!--M_]6 #span/0 7--></span><!--M_'5 #text/0 6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,1,_.a={"ConditionalRenderer:#text/0":"div",inputContent:_.d={},htmlInput:{}},{"ConditionalRenderer:#div/0":"__tests__/tags/my-tag.marko_1_content"},1,_.b={"ConditionalRenderer:#text/0":"span",inputAs:"span",htmlInput:{}},{"ConditionalRenderer:#span/0":"__tests__/tags/my-tag.marko_1_content"}],_.a.inputContent=_._["__tests__/template.marko_1_content"](_.d),_.b.inputContent=_._["__tests__/template.marko_2_content"](_.d),_.c),"__tests__/tags/my-tag.marko_0_inputContent 2 5"];M._.w()</script>
 ```
 
 # Render End
@@ -47,8 +47,7 @@
           ](_.d), _.b.inputContent = _._[
           "__tests__/template.marko_2_content"
           ](_.d), _.c),
-        "__tests__/tags/my-tag.marko_0_inputContent",
-        2, 5
+        "__tests__/tags/my-tag.marko_0_inputContent 2 5"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/resume.expected.md
index 3a1152d38..da199b581 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/resume.expected.md
@@ -24,8 +24,7 @@
           x: 1
         },
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -67,8 +66,7 @@ container.querySelector("button").click();
           x: 1
         },
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -111,8 +109,7 @@ container.querySelector("button").click();
           x: 1
         },
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -155,8 +152,7 @@ container.querySelector("button").click();
           x: 1
         },
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md
index 37174508b..be140b224 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Count: <!>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[--><div>1<!--M_*2 #text/0--></div><!--M_]1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/2":"__tests__/tags/custom-tag.marko",x:1},{}]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <button>Count: <!>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[--><div>1<!--M_*2 #text/0--></div><!--M_]1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/2":"__tests__/tags/custom-tag.marko",x:1},{}]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -29,8 +29,7 @@
           x: 1
         },
         {}]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/resume.expected.md
index 5d594ca9e..237637cd2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/resume.expected.md
@@ -14,8 +14,7 @@
         {
           x: null
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -50,8 +49,7 @@ container.querySelector("button").click();
         {
           x: null
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -86,8 +84,7 @@ container.querySelector("button").click();
         {
           x: null
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/ssr.expected.md
index 3796251bd..61d45829c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[-->Body Content<!--M_]1 #text/0 2--><button></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:null}]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <!--M_[-->Body Content<!--M_]1 #text/0 2--><button></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:null}]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -19,8 +19,7 @@
         {
           x: null
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/resume.expected.md
index 4d5ed1af4..acbbbda0f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/resume.expected.md
@@ -30,10 +30,7 @@
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.c), _.b),
-        "__tests__/tags/counter.marko_0_x",
-        2,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -83,10 +80,7 @@ container.querySelector("button.inc").click();
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.c), _.b),
-        "__tests__/tags/counter.marko_0_x",
-        2,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -134,10 +128,7 @@ container.querySelector("button.inc").click();
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.c), _.b),
-        "__tests__/tags/counter.marko_0_x",
-        2,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -185,10 +176,7 @@ container.querySelector("button.reset").click();
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.c), _.b),
-        "__tests__/tags/counter.marko_0_x",
-        2,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -236,10 +224,7 @@ container.querySelector("button.inc").click();
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.c), _.b),
-        "__tests__/tags/counter.marko_0_x",
-        2,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/ssr.expected.md
index 51961a626..63dde6c38 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[--><button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_]1 #text/0 2--><button class=reset>reset</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"ConditionalRenderer:#text/0":"__tests__/tags/counter.marko","#scopeOffset/1":3},_.a={x:1}],_.a["#TagVariableChange"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["#TagVariable"]=_._["__tests__/template.marko_0_count/var"](_.c),_.b),"__tests__/tags/counter.marko_0_x",2,"__tests__/template.marko_0",1];M._.w()</script>
+  <!--M_[--><button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_]1 #text/0 2--><button class=reset>reset</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"ConditionalRenderer:#text/0":"__tests__/tags/counter.marko","#scopeOffset/1":3},_.a={x:1}],_.a["#TagVariableChange"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["#TagVariable"]=_._["__tests__/template.marko_0_count/var"](_.c),_.b),"__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -35,10 +35,7 @@
           ](_.a), _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_count/var"
           ](_.c), _.b),
-        "__tests__/tags/counter.marko_0_x",
-        2,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/tags/counter.marko_0_x 2 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/resume.expected.md
index b3c80c056..3402d62e7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/resume.expected.md
@@ -33,10 +33,7 @@
           count: 0,
           "#ClosestBranchId": 3
         }]),
-        "__tests__/tags/counter.marko_0_count",
-        4,
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/tags/counter.marko_0_count 4 __tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
@@ -87,10 +84,7 @@ container.querySelector("#count").click();
           count: 0,
           "#ClosestBranchId": 3
         }]),
-        "__tests__/tags/counter.marko_0_count",
-        4,
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/tags/counter.marko_0_count 4 __tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
@@ -137,10 +131,7 @@ container.querySelector("#changeTag").click();
           count: 0,
           "#ClosestBranchId": 3
         }]),
-        "__tests__/tags/counter.marko_0_count",
-        4,
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/tags/counter.marko_0_count 4 __tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
@@ -190,10 +181,7 @@ container.querySelector("#count").click();
           count: 0,
           "#ClosestBranchId": 3
         }]),
-        "__tests__/tags/counter.marko_0_count",
-        4,
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/tags/counter.marko_0_count 4 __tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/ssr.expected.md
index ef8554849..cd0428dbb 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><!--M_[--><button id=count>0<!--M_*4 #text/1--></button><!--M_*4 #button/0--><!--M_]2 #div/0 3--></div><!--M_'1 #text/0 2--><button id=changeTag></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/0":"div",tagName:"div"},{"ConditionalRenderer:#div/0":"__tests__/template.marko_1_content"},1,{count:0,"#ClosestBranchId":3}]),"__tests__/tags/counter.marko_0_count",4,"__tests__/template.marko_0_tagName",1];M._.w()</script>
+  <div><!--M_[--><button id=count>0<!--M_*4 #text/1--></button><!--M_*4 #button/0--><!--M_]2 #div/0 3--></div><!--M_'1 #text/0 2--><button id=changeTag></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/0":"div",tagName:"div"},{"ConditionalRenderer:#div/0":"__tests__/template.marko_1_content"},1,{count:0,"#ClosestBranchId":3}]),"__tests__/tags/counter.marko_0_count 4 __tests__/template.marko_0_tagName 1"];M._.w()</script>
 ```
 
 # Render End
@@ -38,10 +38,7 @@
           count: 0,
           "#ClosestBranchId": 3
         }]),
-        "__tests__/tags/counter.marko_0_count",
-        4,
-        "__tests__/template.marko_0_tagName",
-        1
+        "__tests__/tags/counter.marko_0_count 4 __tests__/template.marko_0_tagName 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/expression-statement-tag-var-assignment/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/expression-statement-tag-var-assignment/__snapshots__/resume.expected.md
index cf3cfa85c..984cf5c0b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/expression-statement-tag-var-assignment/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/expression-statement-tag-var-assignment/__snapshots__/resume.expected.md
@@ -28,10 +28,7 @@
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x_direction",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_x_direction 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -73,10 +70,7 @@ container.querySelector(".change").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x_direction",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_x_direction 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -118,10 +112,7 @@ container.querySelector(".up").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x_direction",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_x_direction 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -163,10 +154,7 @@ container.querySelector(".change").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x_direction",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_x_direction 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -212,10 +200,7 @@ container.querySelector(".change").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x_direction",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_x_direction 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -261,10 +246,7 @@ container.querySelector(".down").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x_direction",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_x_direction 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -306,10 +288,7 @@ container.querySelector(".change").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x_direction",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_x_direction 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -355,10 +334,7 @@ container.querySelector(".change").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x_direction",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_x_direction 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/expression-statement-tag-var-assignment/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/expression-statement-tag-var-assignment/__snapshots__/ssr.expected.md
index 4f9ae3d90..7396551c7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/expression-statement-tag-var-assignment/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/expression-statement-tag-var-assignment/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=up>up</button><!--M_*1 #button/0--><button class=down>down</button><!--M_*1 #button/1--><button class=change>1<!--M_*1 #text/3--></button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:1}]),"__tests__/template.marko_0_x_direction",1,"__tests__/template.marko_0",1];M._.w()</script>
+  <button class=up>up</button><!--M_*1 #button/0--><button class=down>down</button><!--M_*1 #button/1--><button class=change>1<!--M_*1 #text/3--></button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:1}]),"__tests__/template.marko_0_x_direction 1 __tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -33,10 +33,7 @@
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x_direction",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_x_direction 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-by/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-by/__snapshots__/resume.expected.md
index 57f3046aa..60bb7cd88 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-by/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-by/__snapshots__/resume.expected.md
@@ -127,8 +127,7 @@
         {
           "#LoopKey": 2
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -269,8 +268,7 @@ container.querySelector("button").click();
         {
           "#LoopKey": 2
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -421,8 +419,7 @@ container.querySelector("button").click();
         {
           "#LoopKey": 2
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -569,8 +566,7 @@ container.querySelector("button").click();
         {
           "#LoopKey": 2
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-by/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-by/__snapshots__/ssr.expected.md
index 74027bd29..122e9184d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-by/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-by/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><div class=by-string>first<!--M_*2 #text/0-->second<!--M_*3 #text/0-->third<!--M_*4 #text/0--><!--M_}1 #div/0 4 3 2--></div><div class=by-function>first<!--M_*5 #text/0-->second<!--M_*6 #text/0-->third<!--M_*7 #text/0--><!--M_}1 #div/1 7 6 5--></div><div class=by-unknown-string>first<!--M_*8 #text/0-->second<!--M_*9 #text/0-->third<!--M_*10 #text/0--><!--M_}1 #div/2 10 9 8--></div><div class=by-unknown-function>first<!--M_*11 #text/0-->second<!--M_*12 #text/0-->third<!--M_*13 #text/0--><!--M_}1 #div/3 13 12 11--></div><div class=by-unknown-missing>first<!--M_*14 #text/0-->second<!--M_*15 #text/0-->third<!--M_*16 #text/0--><!--M_}1 #div/4 16 15 14--></div><button>Rotate</button><!--M_*1 #button/5--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{items:[{id:0,text:"first"},{id:1,text:"second"},{id:2,text:"third"}]},{"#LoopKey":0},{"#LoopKey":1},{"#LoopKey":2},{"#LoopKey":0},{"#LoopKey":1},{"#LoopKey":2},{"#LoopKey":0},{"#LoopKey":1},{"#LoopKey":2},{"#LoopKey":0},{"#LoopKey":1},{"#LoopKey":2},{"#LoopKey":0},{"#LoopKey":1},{"#LoopKey":2}]),"__tests__/template.marko_0_items",1];M._.w()</script>
+  <div><div class=by-string>first<!--M_*2 #text/0-->second<!--M_*3 #text/0-->third<!--M_*4 #text/0--><!--M_}1 #div/0 4 3 2--></div><div class=by-function>first<!--M_*5 #text/0-->second<!--M_*6 #text/0-->third<!--M_*7 #text/0--><!--M_}1 #div/1 7 6 5--></div><div class=by-unknown-string>first<!--M_*8 #text/0-->second<!--M_*9 #text/0-->third<!--M_*10 #text/0--><!--M_}1 #div/2 10 9 8--></div><div class=by-unknown-function>first<!--M_*11 #text/0-->second<!--M_*12 #text/0-->third<!--M_*13 #text/0--><!--M_}1 #div/3 13 12 11--></div><div class=by-unknown-missing>first<!--M_*14 #text/0-->second<!--M_*15 #text/0-->third<!--M_*16 #text/0--><!--M_}1 #div/4 16 15 14--></div><button>Rotate</button><!--M_*1 #button/5--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{items:[{id:0,text:"first"},{id:1,text:"second"},{id:2,text:"third"}]},{"#LoopKey":0},{"#LoopKey":1},{"#LoopKey":2},{"#LoopKey":0},{"#LoopKey":1},{"#LoopKey":2},{"#LoopKey":0},{"#LoopKey":1},{"#LoopKey":2},{"#LoopKey":0},{"#LoopKey":1},{"#LoopKey":2},{"#LoopKey":0},{"#LoopKey":1},{"#LoopKey":2}]),"__tests__/template.marko_0_items 1"];M._.w()</script>
 ```
 
 # Render End
@@ -132,8 +132,7 @@
         {
           "#LoopKey": 2
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-destructure/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-destructure/__snapshots__/resume.expected.md
index b059a5b2c..8b396228e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-destructure/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-destructure/__snapshots__/resume.expected.md
@@ -39,8 +39,7 @@
         {
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -96,8 +95,7 @@ container.querySelector("#add").click();
         {
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -154,8 +152,7 @@ container.querySelector("#remove").click();
         {
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -204,8 +201,7 @@ container.querySelector("#remove").click();
         {
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -258,8 +254,7 @@ container.querySelector("#add").click();
         {
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-destructure/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-destructure/__snapshots__/ssr.expected.md
index c9191d0ef..11ddc36b8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-destructure/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-destructure/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><div>Marko<!--M_*2 #text/0-->: <!>HTML Reimagined<!--M_*2 #text/1--></div><!--M_|1 #text/0 2--><button id=add>Add</button><!--M_*1 #button/1--><button id=remove>Remove</button><!--M_*1 #button/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{items:[{name:"Marko",description:"HTML Reimagined"}]},{"#LoopKey":0}]),"__tests__/template.marko_0_items",1];M._.w()</script>
+  <div><div>Marko<!--M_*2 #text/0-->: <!>HTML Reimagined<!--M_*2 #text/1--></div><!--M_|1 #text/0 2--><button id=add>Add</button><!--M_*1 #button/1--><button id=remove>Remove</button><!--M_*1 #button/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{items:[{name:"Marko",description:"HTML Reimagined"}]},{"#LoopKey":0}]),"__tests__/template.marko_0_items 1"];M._.w()</script>
 ```
 
 # Render End
@@ -44,8 +44,7 @@
         {
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/resume.expected.md
index a5c54dd25..3ae5d55c7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/resume.expected.md
@@ -17,8 +17,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1_num",
-        2
+        "__tests__/template.marko_1_num 2"
       ];
       M._.w()
     </script>
@@ -52,8 +51,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1_num",
-        2
+        "__tests__/template.marko_1_num 2"
       ];
       M._.w()
     </script>
@@ -94,8 +92,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1_num",
-        2
+        "__tests__/template.marko_1_num 2"
       ];
       M._.w()
     </script>
@@ -139,8 +136,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1_num",
-        2
+        "__tests__/template.marko_1_num 2"
       ];
       M._.w()
     </script>
@@ -187,8 +183,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1_num",
-        2
+        "__tests__/template.marko_1_num 2"
       ];
       M._.w()
     </script>
@@ -238,8 +233,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1_num",
-        2
+        "__tests__/template.marko_1_num 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/ssr.expected.md
index ba6aba260..49bbf8b08 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_|1 #text/0 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={num:0},{_:_.a}]),"__tests__/template.marko_1_num",2];M._.w()</script>
+  <button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_|1 #text/0 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={num:0},{_:_.a}]),"__tests__/template.marko_1_num 2"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1_num",
-        2
+        "__tests__/template.marko_1_num 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-loop-closure-remove-all-items/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-loop-closure-remove-all-items/__snapshots__/resume.expected.md
index f208f04d3..c5a0af486 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-loop-closure-remove-all-items/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-loop-closure-remove-all-items/__snapshots__/resume.expected.md
@@ -21,8 +21,7 @@
           _: _.a,
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_1_items",
-        2
+        "__tests__/template.marko_1_items 2"
       ];
       M._.w()
     </script>
@@ -56,8 +55,7 @@ container.querySelector("button").click();
           _: _.a,
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_1_items",
-        2
+        "__tests__/template.marko_1_items 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-loop-closure-remove-all-items/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-loop-closure-remove-all-items/__snapshots__/ssr.expected.md
index b7b286b72..453a5f861 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-loop-closure-remove-all-items/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-loop-closure-remove-all-items/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><button>Test</button><!--M_*2 #button/0--><!--M_|1 #text/0 2--><div></div><!--M_*1 #div/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={items:["hello"]},{_:_.a,"#LoopKey":0}]),"__tests__/template.marko_1_items",2];M._.w()</script>
+  <div><button>Test</button><!--M_*2 #button/0--><!--M_|1 #text/0 2--><div></div><!--M_*1 #div/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={items:["hello"]},{_:_.a,"#LoopKey":0}]),"__tests__/template.marko_1_items 2"];M._.w()</script>
 ```
 
 # Render End
@@ -26,8 +26,7 @@
           _: _.a,
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_1_items",
-        2
+        "__tests__/template.marko_1_items 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-node-only-child-in-parent/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-node-only-child-in-parent/__snapshots__/resume.expected.md
index d7ca6627d..c1756558d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-node-only-child-in-parent/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-node-only-child-in-parent/__snapshots__/resume.expected.md
@@ -18,8 +18,7 @@
         {
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_0_children",
-        1
+        "__tests__/template.marko_0_children 1"
       ];
       M._.w()
     </script>
@@ -49,8 +48,7 @@
         {
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_0_children",
-        1
+        "__tests__/template.marko_0_children 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-node-only-child-in-parent/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-node-only-child-in-parent/__snapshots__/ssr.expected.md
index 0db3cd61b..b1b6d62b2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-node-only-child-in-parent/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-node-only-child-in-parent/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div data-children=1><div></div><!--M_}1 #div/0 2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{children:[1]},{"#LoopKey":0}]),"__tests__/template.marko_0_children",1];M._.w()</script>
+  <div data-children=1><div></div><!--M_}1 #div/0 2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{children:[1]},{"#LoopKey":0}]),"__tests__/template.marko_0_children 1"];M._.w()</script>
 ```
 
 # Render End
@@ -23,8 +23,7 @@
         {
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_0_children",
-        1
+        "__tests__/template.marko_0_children 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-text-node-with-text-before/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-text-node-with-text-before/__snapshots__/resume.expected.md
index e9a4b9ec0..f8fe4f59b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-text-node-with-text-before/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-text-node-with-text-before/__snapshots__/resume.expected.md
@@ -21,8 +21,7 @@
         {
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_0_children",
-        1
+        "__tests__/template.marko_0_children 1"
       ];
       M._.w()
     </script>
@@ -58,8 +57,7 @@ INSERT html/body/div/#text2
         {
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_0_children",
-        1
+        "__tests__/template.marko_0_children 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-text-node-with-text-before/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-text-node-with-text-before/__snapshots__/ssr.expected.md
index 38a416f24..80f169e10 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-text-node-with-text-before/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-text-node-with-text-before/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div data-children=1>Before <!--M_[-->Child<!--M_]1 #text/1 2--></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{children:[1]},{"#LoopKey":0}]),"__tests__/template.marko_0_children",1];M._.w()</script>
+  <div data-children=1>Before <!--M_[-->Child<!--M_]1 #text/1 2--></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{children:[1]},{"#LoopKey":0}]),"__tests__/template.marko_0_children 1"];M._.w()</script>
 ```
 
 # Render End
@@ -26,8 +26,7 @@
         {
           "#LoopKey": 0
         }]),
-        "__tests__/template.marko_0_children",
-        1
+        "__tests__/template.marko_0_children 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag-static-value-with-closure/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-tag-static-value-with-closure/__snapshots__/resume.expected.md
index 46289c94a..28f9f011f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag-static-value-with-closure/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag-static-value-with-closure/__snapshots__/resume.expected.md
@@ -31,8 +31,7 @@
             .e = {}],
           count: 0
         }, _.b, _.c, _.d, _.e], _.b._ = _.c._ = _.d._ = _.e._ = _.a, _.f),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -77,8 +76,7 @@ container.querySelector("button").click();
             .e = {}],
           count: 0
         }, _.b, _.c, _.d, _.e], _.b._ = _.c._ = _.d._ = _.e._ = _.a, _.f),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -131,8 +129,7 @@ container.querySelector("button").click();
             .e = {}],
           count: 0
         }, _.b, _.c, _.d, _.e], _.b._ = _.c._ = _.d._ = _.e._ = _.a, _.f),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -185,8 +182,7 @@ container.querySelector("button").click();
             .e = {}],
           count: 0
         }, _.b, _.c, _.d, _.e], _.b._ = _.c._ = _.d._ = _.e._ = _.a, _.f),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag-static-value-with-closure/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-tag-static-value-with-closure/__snapshots__/ssr.expected.md
index 4ba0bc726..44314c212 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag-static-value-with-closure/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag-static-value-with-closure/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  0-<!>0<!--M_*2 #text/1-->1-<!>0<!--M_*3 #text/1-->2-<!>0<!--M_*4 #text/1-->3-<!>0<!--M_*5 #text/1--><button>0<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.f=[0,_.a={"BranchScopes:#text/0":[_.b={},_.c={},_.d={},_.e={}],count:0},_.b,_.c,_.d,_.e],_.b._=_.c._=_.d._=_.e._=_.a,_.f),"__tests__/template.marko_0_count",1];M._.w()</script>
+  0-<!>0<!--M_*2 #text/1-->1-<!>0<!--M_*3 #text/1-->2-<!>0<!--M_*4 #text/1-->3-<!>0<!--M_*5 #text/1--><button>0<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.f=[0,_.a={"BranchScopes:#text/0":[_.b={},_.c={},_.d={},_.e={}],count:0},_.b,_.c,_.d,_.e],_.b._=_.c._=_.d._=_.e._=_.a,_.f),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -36,8 +36,7 @@
             .e = {}],
           count: 0
         }, _.b, _.c, _.d, _.e], _.b._ = _.c._ = _.d._ = _.e._ = _.a, _.f),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/resume.expected.md
index 6866a43ea..fddab69ba 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/resume.expected.md
@@ -50,8 +50,7 @@
         {
           "#LoopKey": 2
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -104,8 +103,7 @@
         {
           "#LoopKey": 2
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/ssr.expected.md
index 90491c364..af3eb5538 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>0: 1</div><div>1: 2</div><div>2: 3</div><div>0<!--M_*5 #text/0-->: <!>1<!--M_*5 #text/1--></div><div>1<!--M_*6 #text/0-->: <!>2<!--M_*6 #text/1--></div><div>2<!--M_*7 #text/0-->: <!>3<!--M_*7 #text/1--></div><!--M_|1 #text/1 7 6 5--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{},3,{"#LoopKey":0},{"#LoopKey":1},{"#LoopKey":2}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <div>0: 1</div><div>1: 2</div><div>2: 3</div><div>0<!--M_*5 #text/0-->: <!>1<!--M_*5 #text/1--></div><div>1<!--M_*6 #text/0-->: <!>2<!--M_*6 #text/1--></div><div>2<!--M_*7 #text/0-->: <!>3<!--M_*7 #text/1--></div><!--M_|1 #text/1 7 6 5--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{},3,{"#LoopKey":0},{"#LoopKey":1},{"#LoopKey":2}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -55,8 +55,7 @@
         {
           "#LoopKey": 2
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/function-references-normalize/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/function-references-normalize/__snapshots__/resume.expected.md
index 62e5b4670..25f61f4db 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/function-references-normalize/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/function-references-normalize/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
         }], _.b.bar = _._[
           "__tests__/template.marko_0/baz"
           ](_.d), _.c),
-        "__tests__/template.marko_0_baz",
-        1
+        "__tests__/template.marko_0_baz 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/function-references-normalize/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/function-references-normalize/__snapshots__/ssr.expected.md
index 83a49e1df..0ca1d18f6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/function-references-normalize/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/function-references-normalize/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.d={foo:_.a={bar:"bar"},baz:_.b={foo:_.a}}],_.b.bar=_._["__tests__/template.marko_0/baz"](_.d),_.c),"__tests__/template.marko_0_baz",1];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.d={foo:_.a={bar:"bar"},baz:_.b={foo:_.a}}],_.b.bar=_._["__tests__/template.marko_0/baz"](_.d),_.c),"__tests__/template.marko_0_baz 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
         }], _.b.bar = _._[
           "__tests__/template.marko_0/baz"
           ](_.d), _.c),
-        "__tests__/template.marko_0_baz",
-        1
+        "__tests__/template.marko_0_baz 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/function-references-optional-member-normalize/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/function-references-optional-member-normalize/__snapshots__/resume.expected.md
index f183e3072..6b43c9211 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/function-references-optional-member-normalize/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/function-references-optional-member-normalize/__snapshots__/resume.expected.md
@@ -28,12 +28,7 @@
           ](_.e), _.c.baz = _._[
           "__tests__/template.marko_0/c"
           ](_.e), _.d),
-        "__tests__/template.marko_0_c",
-        1,
-        "__tests__/template.marko_0_b",
-        1,
-        "__tests__/template.marko_0_a",
-        1
+        "__tests__/template.marko_0_c 1 __tests__/template.marko_0_b 1 __tests__/template.marko_0_a 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/function-references-optional-member-normalize/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/function-references-optional-member-normalize/__snapshots__/ssr.expected.md
index 08ab04cb8..c25575e7d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/function-references-optional-member-normalize/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/function-references-optional-member-normalize/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><div></div><!--M_*1 #div/1--><div></div><!--M_*1 #div/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.e={a:_.a={},b:_.b={},c:_.c={}}],_.a.bar=_._["__tests__/template.marko_0/a"](_.e),_.b.baz=_._["__tests__/template.marko_0/b"](_.e),_.c.baz=_._["__tests__/template.marko_0/c"](_.e),_.d),"__tests__/template.marko_0_c",1,"__tests__/template.marko_0_b",1,"__tests__/template.marko_0_a",1];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><div></div><!--M_*1 #div/1--><div></div><!--M_*1 #div/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.e={a:_.a={},b:_.b={},c:_.c={}}],_.a.bar=_._["__tests__/template.marko_0/a"](_.e),_.b.baz=_._["__tests__/template.marko_0/b"](_.e),_.c.baz=_._["__tests__/template.marko_0/c"](_.e),_.d),"__tests__/template.marko_0_c 1 __tests__/template.marko_0_b 1 __tests__/template.marko_0_a 1"];M._.w()</script>
 ```
 
 # Render End
@@ -27,12 +27,7 @@
           ](_.e), _.c.baz = _._[
           "__tests__/template.marko_0/c"
           ](_.e), _.d),
-        "__tests__/template.marko_0_c",
-        1,
-        "__tests__/template.marko_0_b",
-        1,
-        "__tests__/template.marko_0_a",
-        1
+        "__tests__/template.marko_0_c 1 __tests__/template.marko_0_b 1 __tests__/template.marko_0_a 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/function-registration/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/function-registration/__snapshots__/resume.expected.md
index 0ec54e935..525fb5c0a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/function-registration/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/function-registration/__snapshots__/resume.expected.md
@@ -17,8 +17,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -49,8 +48,7 @@ container.querySelector("button").click();
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/function-registration/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/function-registration/__snapshots__/ssr.expected.md
index a717603c9..aa2938cec 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/function-registration/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/function-registration/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>3</div><div>4</div><button>before</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <div>3</div><div>4</div><button>before</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/function-tag-var-registration/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/function-tag-var-registration/__snapshots__/resume.expected.md
index 884a66071..9abb1e05b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/function-tag-var-registration/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/function-tag-var-registration/__snapshots__/resume.expected.md
@@ -18,8 +18,7 @@
             "__tests__/template.marko_0/updateText"
             ]
         }]),
-        "__tests__/template.marko_0_onClick",
-        1
+        "__tests__/template.marko_0_onClick 1"
       ];
       M._.w()
     </script>
@@ -51,8 +50,7 @@ container.querySelector("button").click();
             "__tests__/template.marko_0/updateText"
             ]
         }]),
-        "__tests__/template.marko_0_onClick",
-        1
+        "__tests__/template.marko_0_onClick 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/function-tag-var-registration/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/function-tag-var-registration/__snapshots__/ssr.expected.md
index 5c1fbf69c..20412912d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/function-tag-var-registration/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/function-tag-var-registration/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>3</div><button>before</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{onClick:_._["__tests__/template.marko_0/updateText"]}]),"__tests__/template.marko_0_onClick",1];M._.w()</script>
+  <div>3</div><button>before</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{onClick:_._["__tests__/template.marko_0/updateText"]}]),"__tests__/template.marko_0_onClick 1"];M._.w()</script>
 ```
 
 # Render End
@@ -23,8 +23,7 @@
             "__tests__/template.marko_0/updateText"
             ]
         }]),
-        "__tests__/template.marko_0_onClick",
-        1
+        "__tests__/template.marko_0_onClick 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/getter-on-single-node-only-child/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/getter-on-single-node-only-child/__snapshots__/resume.expected.md
index 3eeb09fae..3dba183ab 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/getter-on-single-node-only-child/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/getter-on-single-node-only-child/__snapshots__/resume.expected.md
@@ -26,10 +26,7 @@
         },
         {},
         {}]),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -76,10 +73,7 @@ container.querySelector("button").click();
         },
         {},
         {}]),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -129,10 +123,7 @@ container.querySelector("button").click();
         },
         {},
         {}]),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -185,10 +176,7 @@ container.querySelector("button").click();
         },
         {},
         {}]),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/getter-on-single-node-only-child/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/getter-on-single-node-only-child/__snapshots__/ssr.expected.md
index c28aa72fa..4464d8ff5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/getter-on-single-node-only-child/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/getter-on-single-node-only-child/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button></button><!--M_*1 #button/0--><ul><li>0<!--M_*2 #text/0--></li><li>1<!--M_*3 #text/0--></li><!--M_}1 #ul/1 3 2--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{items:[0,1]},{},{}]),"__tests__/template.marko_0",1,"__tests__/template.marko_0_items",1];M._.w()</script>
+  <button></button><!--M_*1 #button/0--><ul><li>0<!--M_*2 #text/0--></li><li>1<!--M_*3 #text/0--></li><!--M_}1 #ul/1 3 2--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{items:[0,1]},{},{}]),"__tests__/template.marko_0 1 __tests__/template.marko_0_items 1"];M._.w()</script>
 ```
 
 # Render End
@@ -29,10 +29,7 @@
         },
         {},
         {}]),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/resume.expected.md
index 9fc4e47f5..fd1aba4c3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
           ](_.a), _.b.setHtml = _._[
           "__tests__/tags/child.marko_0/_return"
           ](_.c), (_.e).add(_.b), _.d),
-        "__tests__/template.marko_0_$hoisted_setHtml",
-        1
+        "__tests__/template.marko_0_$hoisted_setHtml 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/ssr.expected.md
index 7fa137a67..8660bbca3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*4 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.a={"ClosureScopes:1":_.e=new Set},1,_.b={setHtml:_.c={}},_.c],_.a.$hoisted_setHtml=_._["__tests__/template.marko_0_$hoisted_setHtml/hoist"](_.a),_.b.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.c),(_.e).add(_.b),_.d),"__tests__/template.marko_0_$hoisted_setHtml",1];M._.w()</script>
+  <div></div><!--M_*4 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.a={"ClosureScopes:1":_.e=new Set},1,_.b={setHtml:_.c={}},_.c],_.a.$hoisted_setHtml=_._["__tests__/template.marko_0_$hoisted_setHtml/hoist"](_.a),_.b.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.c),(_.e).add(_.b),_.d),"__tests__/template.marko_0_$hoisted_setHtml 1"];M._.w()</script>
 ```
 
 # Render End
@@ -21,8 +21,7 @@
           ](_.a), _.b.setHtml = _._[
           "__tests__/tags/child.marko_0/_return"
           ](_.c), (_.e).add(_.b), _.d),
-        "__tests__/template.marko_0_$hoisted_setHtml",
-        1
+        "__tests__/template.marko_0_$hoisted_setHtml 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/resume.expected.md
index c6299f76c..cd3c2c146 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/resume.expected.md
@@ -71,10 +71,7 @@
             ](_.o), (_.q).add(_.b), _.q.add(_.d), (_.r).add(_.f), _.r.add(_
           .h), (_.s).add(_.t), (_.u).add(_.j), _.u.add(_.l), _.s.add(_.v), (_
             .w).add(_.n), _.p),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_$hoisted_setHtml",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_$hoisted_setHtml 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/ssr.expected.md
index 7a0d4a088..b42ff91f9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*4 #div/0--><div></div><!--M_*6 #div/0--><div></div><!--M_*11 #div/0--><div></div><!--M_*13 #div/0--><div></div><!--M_*17 #div/0--><div></div><!--M_*19 #div/0--><section><div></div><!--M_*22 #div/0--></section><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.p=[0,_.a={"ClosureScopes:1":_.q=new Set,"ClosureScopes:2":_.s=new Set,"ClosureScopes:4":_.w=new Set},1,_.b={setHtml:_.c={}},_.c,_.d={setHtml:_.e={}},_.e,1,_.t={"ClosureScopes:3":_.r=new Set},1,_.f={setHtml2:_.g={}},_.g,_.h={setHtml2:_.i={}},_.i,_.v={"ClosureScopes:3":_.u=new Set},1,_.j={setHtml2:_.k={}},_.k,_.l={setHtml2:_.m={}},_.m,1,_.n={setHtml3:_.o={}},_.o],_.a.$hoisted_setHtml=_._["__tests__/template.marko_0_$hoisted_setHtml/hoist"](_.a),_.b.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.c),_.d.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.e),_.f.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.g),_.h.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.i),_.j.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.k),_.l.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.m),_.n.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.o),(_.q).add(_.b),_.q.add(_.d),(_.r).add(_.f),_.r.add(_.h),(_.s).add(_.t),(_.u).add(_.j),_.u.add(_.l),_.s.add(_.v),(_.w).add(_.n),_.p),"__tests__/template.marko_0",1,"__tests__/template.marko_0_$hoisted_setHtml",1];M._.w()</script>
+  <div></div><!--M_*4 #div/0--><div></div><!--M_*6 #div/0--><div></div><!--M_*11 #div/0--><div></div><!--M_*13 #div/0--><div></div><!--M_*17 #div/0--><div></div><!--M_*19 #div/0--><section><div></div><!--M_*22 #div/0--></section><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.p=[0,_.a={"ClosureScopes:1":_.q=new Set,"ClosureScopes:2":_.s=new Set,"ClosureScopes:4":_.w=new Set},1,_.b={setHtml:_.c={}},_.c,_.d={setHtml:_.e={}},_.e,1,_.t={"ClosureScopes:3":_.r=new Set},1,_.f={setHtml2:_.g={}},_.g,_.h={setHtml2:_.i={}},_.i,_.v={"ClosureScopes:3":_.u=new Set},1,_.j={setHtml2:_.k={}},_.k,_.l={setHtml2:_.m={}},_.m,1,_.n={setHtml3:_.o={}},_.o],_.a.$hoisted_setHtml=_._["__tests__/template.marko_0_$hoisted_setHtml/hoist"](_.a),_.b.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.c),_.d.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.e),_.f.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.g),_.h.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.i),_.j.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.k),_.l.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.m),_.n.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.o),(_.q).add(_.b),_.q.add(_.d),(_.r).add(_.f),_.r.add(_.h),(_.s).add(_.t),(_.u).add(_.j),_.u.add(_.l),_.s.add(_.v),(_.w).add(_.n),_.p),"__tests__/template.marko_0 1 __tests__/template.marko_0_$hoisted_setHtml 1"];M._.w()</script>
 ```
 
 # Render End
@@ -67,10 +67,7 @@
             ](_.o), (_.q).add(_.b), _.q.add(_.d), (_.r).add(_.f), _.r.add(_
           .h), (_.s).add(_.t), (_.u).add(_.j), _.u.add(_.l), _.s.add(_.v), (_
             .w).add(_.n), _.p),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_$hoisted_setHtml",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_$hoisted_setHtml 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/resume.expected.md
index a80692fc2..38b1c16ea 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/resume.expected.md
@@ -228,10 +228,7 @@
           ](_.cb), _.z.setHtml3 = _._[
           "__tests__/tags/child.marko_0/_return"
           ](_.db), _.eb),
-        "__tests__/template.marko_0_$hoisted_setHtml3",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_$hoisted_setHtml3 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/ssr.expected.md
index 2496d9954..b55a675a5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*3 #div/0--><div></div><!--M_*5 #div/0--><div></div><!--M_*7 #div/0--><div></div><!--M_*9 #div/0--><div></div><!--M_*11 #div/0--><div></div><!--M_*13 #div/0--><hr><div></div><!--M_*15 #div/0--><div></div><!--M_*17 #div/0--><div></div><!--M_*19 #div/0--><div></div><!--M_*21 #div/0--><hr><ul><div></div><!--M_*24 #div/0--><div></div><!--M_*26 #div/0--><div></div><!--M_*28 #div/0--><div></div><!--M_*30 #div/0--></ul><ul><div></div><!--M_*33 #div/0--><div></div><!--M_*35 #div/0--><div></div><!--M_*37 #div/0--><div></div><!--M_*39 #div/0--></ul><ul><div></div><!--M_*42 #div/0--><div></div><!--M_*44 #div/0--><div></div><!--M_*46 #div/0--><div></div><!--M_*48 #div/0--></ul><ul><div></div><!--M_*51 #div/0--><div></div><!--M_*53 #div/0--><div></div><!--M_*55 #div/0--><div></div><!--M_*57 #div/0--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.eb=[0,_.A={"BranchScopes:#text/0":[_.a={setHtml:_.B={}},_.b={setHtml:_.C={}},_.c={setHtml:_.D={}},_.d={setHtml:_.E={}},_.e={setHtml:_.F={}},_.f={setHtml:_.G={}}],"BranchScopes:#text/1":[_.g={setHtml2:_.H={}},_.h={setHtml2:_.I={}},_.i={setHtml2:_.J={}},_.j={setHtml2:_.K={}}],"BranchScopes:#text/2":[_.L={"BranchScopes:#ul/0":[_.k={setHtml3:_.M={}},_.l={setHtml3:_.N={}},_.m={setHtml3:_.O={}},_.n={setHtml3:_.P={}}]},_.Q={"BranchScopes:#ul/0":[_.o={setHtml3:_.R={}},_.p={setHtml3:_.S={}},_.q={setHtml3:_.T={}},_.r={setHtml3:_.U={}}]},_.V={"BranchScopes:#ul/0":[_.s={setHtml3:_.W={}},_.t={setHtml3:_.X={}},_.u={setHtml3:_.Y={}},_.v={setHtml3:_.Z={}}]},_.$={"BranchScopes:#ul/0":[_.w={setHtml3:_.ab={}},_.x={setHtml3:_.bb={}},_.y={setHtml3:_.cb={}},_.z={setHtml3:_.db={}}]}]},_.a,_.B,_.b,_.C,_.c,_.D,_.d,_.E,_.e,_.F,_.f,_.G,_.g,_.H,_.h,_.I,_.i,_.J,_.j,_.K,_.L,_.k,_.M,_.l,_.N,_.m,_.O,_.n,_.P,_.Q,_.o,_.R,_.p,_.S,_.q,_.T,_.r,_.U,_.V,_.s,_.W,_.t,_.X,_.u,_.Y,_.v,_.Z,_.$,_.w,_.ab,_.x,_.bb,_.y,_.cb,_.z,_.db],_.A.$hoisted_setHtml3=_._["__tests__/template.marko_0_$hoisted_setHtml3/hoist"](_.A),_.a.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.B),_.b.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.C),_.c.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.D),_.d.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.E),_.e.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.F),_.f.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.G),_.g.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.H),_.h.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.I),_.i.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.J),_.j.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.K),_.k.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.M),_.l.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.N),_.m.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.O),_.n.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.P),_.o.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.R),_.p.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.S),_.q.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.T),_.r.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.U),_.s.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.W),_.t.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.X),_.u.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.Y),_.v.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.Z),_.w.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.ab),_.x.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.bb),_.y.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.cb),_.z.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.db),_.eb),"__tests__/template.marko_0_$hoisted_setHtml3",1,"__tests__/template.marko_0",1];M._.w()</script>
+  <div></div><!--M_*3 #div/0--><div></div><!--M_*5 #div/0--><div></div><!--M_*7 #div/0--><div></div><!--M_*9 #div/0--><div></div><!--M_*11 #div/0--><div></div><!--M_*13 #div/0--><hr><div></div><!--M_*15 #div/0--><div></div><!--M_*17 #div/0--><div></div><!--M_*19 #div/0--><div></div><!--M_*21 #div/0--><hr><ul><div></div><!--M_*24 #div/0--><div></div><!--M_*26 #div/0--><div></div><!--M_*28 #div/0--><div></div><!--M_*30 #div/0--></ul><ul><div></div><!--M_*33 #div/0--><div></div><!--M_*35 #div/0--><div></div><!--M_*37 #div/0--><div></div><!--M_*39 #div/0--></ul><ul><div></div><!--M_*42 #div/0--><div></div><!--M_*44 #div/0--><div></div><!--M_*46 #div/0--><div></div><!--M_*48 #div/0--></ul><ul><div></div><!--M_*51 #div/0--><div></div><!--M_*53 #div/0--><div></div><!--M_*55 #div/0--><div></div><!--M_*57 #div/0--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.eb=[0,_.A={"BranchScopes:#text/0":[_.a={setHtml:_.B={}},_.b={setHtml:_.C={}},_.c={setHtml:_.D={}},_.d={setHtml:_.E={}},_.e={setHtml:_.F={}},_.f={setHtml:_.G={}}],"BranchScopes:#text/1":[_.g={setHtml2:_.H={}},_.h={setHtml2:_.I={}},_.i={setHtml2:_.J={}},_.j={setHtml2:_.K={}}],"BranchScopes:#text/2":[_.L={"BranchScopes:#ul/0":[_.k={setHtml3:_.M={}},_.l={setHtml3:_.N={}},_.m={setHtml3:_.O={}},_.n={setHtml3:_.P={}}]},_.Q={"BranchScopes:#ul/0":[_.o={setHtml3:_.R={}},_.p={setHtml3:_.S={}},_.q={setHtml3:_.T={}},_.r={setHtml3:_.U={}}]},_.V={"BranchScopes:#ul/0":[_.s={setHtml3:_.W={}},_.t={setHtml3:_.X={}},_.u={setHtml3:_.Y={}},_.v={setHtml3:_.Z={}}]},_.$={"BranchScopes:#ul/0":[_.w={setHtml3:_.ab={}},_.x={setHtml3:_.bb={}},_.y={setHtml3:_.cb={}},_.z={setHtml3:_.db={}}]}]},_.a,_.B,_.b,_.C,_.c,_.D,_.d,_.E,_.e,_.F,_.f,_.G,_.g,_.H,_.h,_.I,_.i,_.J,_.j,_.K,_.L,_.k,_.M,_.l,_.N,_.m,_.O,_.n,_.P,_.Q,_.o,_.R,_.p,_.S,_.q,_.T,_.r,_.U,_.V,_.s,_.W,_.t,_.X,_.u,_.Y,_.v,_.Z,_.$,_.w,_.ab,_.x,_.bb,_.y,_.cb,_.z,_.db],_.A.$hoisted_setHtml3=_._["__tests__/template.marko_0_$hoisted_setHtml3/hoist"](_.A),_.a.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.B),_.b.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.C),_.c.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.D),_.d.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.E),_.e.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.F),_.f.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.G),_.g.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.H),_.h.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.I),_.i.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.J),_.j.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.K),_.k.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.M),_.l.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.N),_.m.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.O),_.n.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.P),_.o.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.R),_.p.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.S),_.q.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.T),_.r.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.U),_.s.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.W),_.t.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.X),_.u.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.Y),_.v.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.Z),_.w.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.ab),_.x.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.bb),_.y.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.cb),_.z.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.db),_.eb),"__tests__/template.marko_0_$hoisted_setHtml3 1 __tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -196,10 +196,7 @@
           ](_.cb), _.z.setHtml3 = _._[
           "__tests__/tags/child.marko_0/_return"
           ](_.db), _.eb),
-        "__tests__/template.marko_0_$hoisted_setHtml3",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_$hoisted_setHtml3 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-same-scope/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-same-scope/__snapshots__/resume.expected.md
index 76442259e..bf981688b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-same-scope/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-same-scope/__snapshots__/resume.expected.md
@@ -16,8 +16,7 @@
           ](_.a), _.a.setHtml = _._[
           "__tests__/tags/child.marko_0/_return"
           ](_.c), _.d),
-        "__tests__/tags/thing.marko_0_input_value",
-        2
+        "__tests__/tags/thing.marko_0_input_value 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-same-scope/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-same-scope/__snapshots__/ssr.expected.md
index 771e6793f..25e6c10c8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-same-scope/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-same-scope/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*3 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.a={setHtml:_.c={},"#childScope/0":_.b={}},_.b,_.c],_.b.input_value=_._["__tests__/template.marko_0_$hoisted_setHtml/hoist"](_.a),_.a.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.c),_.d),"__tests__/tags/thing.marko_0_input_value",2];M._.w()</script>
+  <div></div><!--M_*3 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.a={setHtml:_.c={},"#childScope/0":_.b={}},_.b,_.c],_.b.input_value=_._["__tests__/template.marko_0_$hoisted_setHtml/hoist"](_.a),_.a.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.c),_.d),"__tests__/tags/thing.marko_0_input_value 2"];M._.w()</script>
 ```
 
 # Render End
@@ -20,8 +20,7 @@
           ](_.a), _.a.setHtml = _._[
           "__tests__/tags/child.marko_0/_return"
           ](_.c), _.d),
-        "__tests__/tags/thing.marko_0_input_value",
-        2
+        "__tests__/tags/thing.marko_0_input_value 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/resume.expected.md
index 8eb53bba2..6fa7a3a0d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/resume.expected.md
@@ -43,12 +43,7 @@
           ](_.g), _.c.setHtml3 = _._[
           "__tests__/tags/child.marko_0/_return"
           ](_.h), _.j),
-        "__tests__/tags/thing.marko_0_input_value",
-        5,
-        "__tests__/template.marko_5",
-        10,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/tags/thing.marko_0_input_value 5 __tests__/template.marko_5 10 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/ssr.expected.md
index 64c28b1e1..c9c4a3a58 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*4 #div/0--><div></div><!--M_*7 #div/0--><div></div><!--M_*9 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.j=[0,_.i={"BranchScopes:#text/0":_.e={"BranchScopes:#text/0":_.a={setHtml:_.f={}}},"BranchScopes:#text/2":_.b={setHtml2:_.g={}},"BranchScopes:#text/3":_.c={setHtml3:_.h={}},"#childScope/1":_.d={}},_.e,_.a,_.f,_.d,_.b,_.g,_.c,_.h,{_:_.i}],_.d.input_value=_._["__tests__/template.marko_0_$hoisted_setHtml/hoist"](_.i),_.a.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.f),_.b.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.g),_.c.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.h),_.j),"__tests__/tags/thing.marko_0_input_value",5,"__tests__/template.marko_5",10,"__tests__/template.marko_0",1];M._.w()</script>
+  <div></div><!--M_*4 #div/0--><div></div><!--M_*7 #div/0--><div></div><!--M_*9 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.j=[0,_.i={"BranchScopes:#text/0":_.e={"BranchScopes:#text/0":_.a={setHtml:_.f={}}},"BranchScopes:#text/2":_.b={setHtml2:_.g={}},"BranchScopes:#text/3":_.c={setHtml3:_.h={}},"#childScope/1":_.d={}},_.e,_.a,_.f,_.d,_.b,_.g,_.c,_.h,{_:_.i}],_.d.input_value=_._["__tests__/template.marko_0_$hoisted_setHtml/hoist"](_.i),_.a.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.f),_.b.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.g),_.c.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.h),_.j),"__tests__/tags/thing.marko_0_input_value 5 __tests__/template.marko_5 10 __tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -41,12 +41,7 @@
           ](_.g), _.c.setHtml3 = _._[
           "__tests__/tags/child.marko_0/_return"
           ](_.h), _.j),
-        "__tests__/tags/thing.marko_0_input_value",
-        5,
-        "__tests__/template.marko_5",
-        10,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/tags/thing.marko_0_input_value 5 __tests__/template.marko_5 10 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/resume.expected.md
index dd75a5d69..2e701585c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/resume.expected.md
@@ -113,10 +113,7 @@
             ](_.n), (_.q).add(_.b), _.q.add(_.d), (_.r).add(_.f), _.r.add(_
           .h), (_.s).add(_.t), (_.u).add(_.j), _.u.add(_.l), _.s.add(_.v), (_
             .w).add(_.n), _.p),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_$hoisted_setHtml",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_$hoisted_setHtml 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/ssr.expected.md
index 7bfdbcbcc..f6bf41553 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[--><div></div><!--M_*4 #div/0--><!--M_]3 #text/0 4--><!--M_[--><div></div><!--M_*7 #div/0--><!--M_]6 #text/0 7--><!--M_[--><div></div><!--M_*13 #div/0--><!--M_]12 #text/0 13--><!--M_[--><div></div><!--M_*16 #div/0--><!--M_]15 #text/0 16--><!--M_[--><div></div><!--M_*21 #div/0--><!--M_]20 #text/0 21--><!--M_[--><div></div><!--M_*24 #div/0--><!--M_]23 #text/0 24--><section><!--M_[--><div></div><!--M_*28 #div/0--><!--M_]27 #text/0 28--></section><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.p=[0,_.a={"ClosureScopes:1":_.q=new Set,"ClosureScopes:2":_.s=new Set,"ClosureScopes:4":_.w=new Set},1,_.b={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":5,setHtml:_.c={}},_.c,1,_.d={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":8,setHtml:_.e={}},_.e,2,_.t={"ClosureScopes:3":_.r=new Set},1,_.f={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":14,setHtml2:_.g={}},_.g,1,_.h={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":17,setHtml2:_.i={}},_.i,1,_.v={"ClosureScopes:3":_.u=new Set},1,_.j={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":22,setHtml2:_.k={}},_.k,1,_.l={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":25,setHtml2:_.m={}},_.m,2,_.n={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":29,setHtml3:_.o={}},_.o],_.a.$hoisted_setHtml=_._["__tests__/template.marko_0_$hoisted_setHtml/hoist"](_.a),_.b.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.c),_.c["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),_.d.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.e),_.e["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.d),_.f.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.g),_.g["#TagVariable"]=_._["__tests__/template.marko_3_setHtml2/var"](_.f),_.h.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.i),_.i["#TagVariable"]=_._["__tests__/template.marko_3_setHtml2/var"](_.h),_.j.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.k),_.k["#TagVariable"]=_._["__tests__/template.marko_3_setHtml2/var"](_.j),_.l.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.m),_.m["#TagVariable"]=_._["__tests__/template.marko_3_setHtml2/var"](_.l),_.n.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.o),_.o["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.n),(_.q).add(_.b),_.q.add(_.d),(_.r).add(_.f),_.r.add(_.h),(_.s).add(_.t),(_.u).add(_.j),_.u.add(_.l),_.s.add(_.v),(_.w).add(_.n),_.p),"__tests__/template.marko_0",1,"__tests__/template.marko_0_$hoisted_setHtml",1];M._.w()</script>
+  <!--M_[--><div></div><!--M_*4 #div/0--><!--M_]3 #text/0 4--><!--M_[--><div></div><!--M_*7 #div/0--><!--M_]6 #text/0 7--><!--M_[--><div></div><!--M_*13 #div/0--><!--M_]12 #text/0 13--><!--M_[--><div></div><!--M_*16 #div/0--><!--M_]15 #text/0 16--><!--M_[--><div></div><!--M_*21 #div/0--><!--M_]20 #text/0 21--><!--M_[--><div></div><!--M_*24 #div/0--><!--M_]23 #text/0 24--><section><!--M_[--><div></div><!--M_*28 #div/0--><!--M_]27 #text/0 28--></section><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.p=[0,_.a={"ClosureScopes:1":_.q=new Set,"ClosureScopes:2":_.s=new Set,"ClosureScopes:4":_.w=new Set},1,_.b={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":5,setHtml:_.c={}},_.c,1,_.d={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":8,setHtml:_.e={}},_.e,2,_.t={"ClosureScopes:3":_.r=new Set},1,_.f={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":14,setHtml2:_.g={}},_.g,1,_.h={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":17,setHtml2:_.i={}},_.i,1,_.v={"ClosureScopes:3":_.u=new Set},1,_.j={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":22,setHtml2:_.k={}},_.k,1,_.l={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":25,setHtml2:_.m={}},_.m,2,_.n={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":29,setHtml3:_.o={}},_.o],_.a.$hoisted_setHtml=_._["__tests__/template.marko_0_$hoisted_setHtml/hoist"](_.a),_.b.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.c),_.c["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),_.d.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.e),_.e["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.d),_.f.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.g),_.g["#TagVariable"]=_._["__tests__/template.marko_3_setHtml2/var"](_.f),_.h.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.i),_.i["#TagVariable"]=_._["__tests__/template.marko_3_setHtml2/var"](_.h),_.j.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.k),_.k["#TagVariable"]=_._["__tests__/template.marko_3_setHtml2/var"](_.j),_.l.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.m),_.m["#TagVariable"]=_._["__tests__/template.marko_3_setHtml2/var"](_.l),_.n.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.o),_.o["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.n),(_.q).add(_.b),_.q.add(_.d),(_.r).add(_.f),_.r.add(_.h),(_.s).add(_.t),(_.u).add(_.j),_.u.add(_.l),_.s.add(_.v),(_.w).add(_.n),_.p),"__tests__/template.marko_0 1 __tests__/template.marko_0_$hoisted_setHtml 1"];M._.w()</script>
 ```
 
 # Render End
@@ -109,10 +109,7 @@
             ](_.n), (_.q).add(_.b), _.q.add(_.d), (_.r).add(_.f), _.r.add(_
           .h), (_.s).add(_.t), (_.u).add(_.j), _.u.add(_.l), _.s.add(_.v), (_
             .w).add(_.n), _.p),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_$hoisted_setHtml",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_$hoisted_setHtml 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/resume.expected.md
index 2d9a1bc13..b5890e7b8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/resume.expected.md
@@ -385,10 +385,7 @@
           ](_.Z), _.Z["#TagVariable"] = _._[
           "__tests__/template.marko_4_setHtml3/var"
           ](_.Y), _.eb),
-        "__tests__/template.marko_0_$hoisted_setHtml3",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_$hoisted_setHtml3 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/ssr.expected.md
index f1e275a4b..736be0a36 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[--><div></div><!--M_*3 #div/0--><!--M_]2 #text/0 3--><!--M_[--><div></div><!--M_*6 #div/0--><!--M_]5 #text/0 6--><!--M_[--><div></div><!--M_*9 #div/0--><!--M_]8 #text/0 9--><!--M_[--><div></div><!--M_*12 #div/0--><!--M_]11 #text/0 12--><!--M_[--><div></div><!--M_*15 #div/0--><!--M_]14 #text/0 15--><!--M_[--><div></div><!--M_*18 #div/0--><!--M_]17 #text/0 18--><hr><!--M_[--><div></div><!--M_*21 #div/0--><!--M_]20 #text/0 21--><!--M_[--><div></div><!--M_*24 #div/0--><!--M_]23 #text/0 24--><!--M_[--><div></div><!--M_*27 #div/0--><!--M_]26 #text/0 27--><!--M_[--><div></div><!--M_*30 #div/0--><!--M_]29 #text/0 30--><hr><ul><!--M_[--><div></div><!--M_*34 #div/0--><!--M_]33 #text/0 34--><!--M_[--><div></div><!--M_*37 #div/0--><!--M_]36 #text/0 37--><!--M_[--><div></div><!--M_*40 #div/0--><!--M_]39 #text/0 40--><!--M_[--><div></div><!--M_*43 #div/0--><!--M_]42 #text/0 43--></ul><ul><!--M_[--><div></div><!--M_*47 #div/0--><!--M_]46 #text/0 47--><!--M_[--><div></div><!--M_*50 #div/0--><!--M_]49 #text/0 50--><!--M_[--><div></div><!--M_*53 #div/0--><!--M_]52 #text/0 53--><!--M_[--><div></div><!--M_*56 #div/0--><!--M_]55 #text/0 56--></ul><ul><!--M_[--><div></div><!--M_*60 #div/0--><!--M_]59 #text/0 60--><!--M_[--><div></div><!--M_*63 #div/0--><!--M_]62 #text/0 63--><!--M_[--><div></div><!--M_*66 #div/0--><!--M_]65 #text/0 66--><!--M_[--><div></div><!--M_*69 #div/0--><!--M_]68 #text/0 69--></ul><ul><!--M_[--><div></div><!--M_*73 #div/0--><!--M_]72 #text/0 73--><!--M_[--><div></div><!--M_*76 #div/0--><!--M_]75 #text/0 76--><!--M_[--><div></div><!--M_*79 #div/0--><!--M_]78 #text/0 79--><!--M_[--><div></div><!--M_*82 #div/0--><!--M_]81 #text/0 82--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.eb=[0,_.$={"BranchScopes:#text/0":[_.a={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":4,setHtml:_.b={}},_.c={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":7,setHtml:_.d={}},_.e={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":10,setHtml:_.f={}},_.g={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":13,setHtml:_.h={}},_.i={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":16,setHtml:_.j={}},_.k={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":19,setHtml:_.l={}}],"BranchScopes:#text/1":[_.m={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":22,setHtml2:_.n={}},_.o={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":25,setHtml2:_.p={}},_.q={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":28,setHtml2:_.r={}},_.s={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":31,setHtml2:_.t={}}],"BranchScopes:#text/2":[_.ab={"BranchScopes:#ul/0":[_.u={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":35,setHtml3:_.v={}},_.w={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":38,setHtml3:_.x={}},_.y={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":41,setHtml3:_.z={}},_.A={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":44,setHtml3:_.B={}}]},_.bb={"BranchScopes:#ul/0":[_.C={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":48,setHtml3:_.D={}},_.E={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":51,setHtml3:_.F={}},_.G={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":54,setHtml3:_.H={}},_.I={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":57,setHtml3:_.J={}}]},_.cb={"BranchScopes:#ul/0":[_.K={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":61,setHtml3:_.L={}},_.M={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":64,setHtml3:_.N={}},_.O={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":67,setHtml3:_.P={}},_.Q={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":70,setHtml3:_.R={}}]},_.db={"BranchScopes:#ul/0":[_.S={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":74,setHtml3:_.T={}},_.U={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":77,setHtml3:_.V={}},_.W={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":80,setHtml3:_.X={}},_.Y={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":83,setHtml3:_.Z={}}]}]},_.a,_.b,1,_.c,_.d,1,_.e,_.f,1,_.g,_.h,1,_.i,_.j,1,_.k,_.l,1,_.m,_.n,1,_.o,_.p,1,_.q,_.r,1,_.s,_.t,1,_.ab,_.u,_.v,1,_.w,_.x,1,_.y,_.z,1,_.A,_.B,1,_.bb,_.C,_.D,1,_.E,_.F,1,_.G,_.H,1,_.I,_.J,1,_.cb,_.K,_.L,1,_.M,_.N,1,_.O,_.P,1,_.Q,_.R,1,_.db,_.S,_.T,1,_.U,_.V,1,_.W,_.X,1,_.Y,_.Z],_.$.$hoisted_setHtml3=_._["__tests__/template.marko_0_$hoisted_setHtml3/hoist"](_.$),_.a.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.b),_.b["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.a),_.c.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.d),_.d["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.e.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.f),_.f["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.g.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.h),_.h["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.g),_.i.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.j),_.j["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.i),_.k.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.l),_.l["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.k),_.m.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.n),_.n["#TagVariable"]=_._["__tests__/template.marko_2_setHtml2/var"](_.m),_.o.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.p),_.p["#TagVariable"]=_._["__tests__/template.marko_2_setHtml2/var"](_.o),_.q.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.r),_.r["#TagVariable"]=_._["__tests__/template.marko_2_setHtml2/var"](_.q),_.s.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.t),_.t["#TagVariable"]=_._["__tests__/template.marko_2_setHtml2/var"](_.s),_.u.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.v),_.v["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.u),_.w.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.x),_.x["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.w),_.y.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.z),_.z["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.y),_.A.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.B),_.B["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.A),_.C.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.D),_.D["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.C),_.E.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.F),_.F["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.E),_.G.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.H),_.H["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.G),_.I.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.J),_.J["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.I),_.K.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.L),_.L["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.K),_.M.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.N),_.N["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.M),_.O.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.P),_.P["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.O),_.Q.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.R),_.R["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.Q),_.S.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.T),_.T["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.S),_.U.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.V),_.V["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.U),_.W.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.X),_.X["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.W),_.Y.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.Z),_.Z["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.Y),_.eb),"__tests__/template.marko_0_$hoisted_setHtml3",1,"__tests__/template.marko_0",1];M._.w()</script>
+  <!--M_[--><div></div><!--M_*3 #div/0--><!--M_]2 #text/0 3--><!--M_[--><div></div><!--M_*6 #div/0--><!--M_]5 #text/0 6--><!--M_[--><div></div><!--M_*9 #div/0--><!--M_]8 #text/0 9--><!--M_[--><div></div><!--M_*12 #div/0--><!--M_]11 #text/0 12--><!--M_[--><div></div><!--M_*15 #div/0--><!--M_]14 #text/0 15--><!--M_[--><div></div><!--M_*18 #div/0--><!--M_]17 #text/0 18--><hr><!--M_[--><div></div><!--M_*21 #div/0--><!--M_]20 #text/0 21--><!--M_[--><div></div><!--M_*24 #div/0--><!--M_]23 #text/0 24--><!--M_[--><div></div><!--M_*27 #div/0--><!--M_]26 #text/0 27--><!--M_[--><div></div><!--M_*30 #div/0--><!--M_]29 #text/0 30--><hr><ul><!--M_[--><div></div><!--M_*34 #div/0--><!--M_]33 #text/0 34--><!--M_[--><div></div><!--M_*37 #div/0--><!--M_]36 #text/0 37--><!--M_[--><div></div><!--M_*40 #div/0--><!--M_]39 #text/0 40--><!--M_[--><div></div><!--M_*43 #div/0--><!--M_]42 #text/0 43--></ul><ul><!--M_[--><div></div><!--M_*47 #div/0--><!--M_]46 #text/0 47--><!--M_[--><div></div><!--M_*50 #div/0--><!--M_]49 #text/0 50--><!--M_[--><div></div><!--M_*53 #div/0--><!--M_]52 #text/0 53--><!--M_[--><div></div><!--M_*56 #div/0--><!--M_]55 #text/0 56--></ul><ul><!--M_[--><div></div><!--M_*60 #div/0--><!--M_]59 #text/0 60--><!--M_[--><div></div><!--M_*63 #div/0--><!--M_]62 #text/0 63--><!--M_[--><div></div><!--M_*66 #div/0--><!--M_]65 #text/0 66--><!--M_[--><div></div><!--M_*69 #div/0--><!--M_]68 #text/0 69--></ul><ul><!--M_[--><div></div><!--M_*73 #div/0--><!--M_]72 #text/0 73--><!--M_[--><div></div><!--M_*76 #div/0--><!--M_]75 #text/0 76--><!--M_[--><div></div><!--M_*79 #div/0--><!--M_]78 #text/0 79--><!--M_[--><div></div><!--M_*82 #div/0--><!--M_]81 #text/0 82--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.eb=[0,_.$={"BranchScopes:#text/0":[_.a={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":4,setHtml:_.b={}},_.c={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":7,setHtml:_.d={}},_.e={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":10,setHtml:_.f={}},_.g={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":13,setHtml:_.h={}},_.i={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":16,setHtml:_.j={}},_.k={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":19,setHtml:_.l={}}],"BranchScopes:#text/1":[_.m={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":22,setHtml2:_.n={}},_.o={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":25,setHtml2:_.p={}},_.q={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":28,setHtml2:_.r={}},_.s={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":31,setHtml2:_.t={}}],"BranchScopes:#text/2":[_.ab={"BranchScopes:#ul/0":[_.u={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":35,setHtml3:_.v={}},_.w={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":38,setHtml3:_.x={}},_.y={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":41,setHtml3:_.z={}},_.A={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":44,setHtml3:_.B={}}]},_.bb={"BranchScopes:#ul/0":[_.C={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":48,setHtml3:_.D={}},_.E={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":51,setHtml3:_.F={}},_.G={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":54,setHtml3:_.H={}},_.I={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":57,setHtml3:_.J={}}]},_.cb={"BranchScopes:#ul/0":[_.K={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":61,setHtml3:_.L={}},_.M={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":64,setHtml3:_.N={}},_.O={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":67,setHtml3:_.P={}},_.Q={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":70,setHtml3:_.R={}}]},_.db={"BranchScopes:#ul/0":[_.S={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":74,setHtml3:_.T={}},_.U={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":77,setHtml3:_.V={}},_.W={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":80,setHtml3:_.X={}},_.Y={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":83,setHtml3:_.Z={}}]}]},_.a,_.b,1,_.c,_.d,1,_.e,_.f,1,_.g,_.h,1,_.i,_.j,1,_.k,_.l,1,_.m,_.n,1,_.o,_.p,1,_.q,_.r,1,_.s,_.t,1,_.ab,_.u,_.v,1,_.w,_.x,1,_.y,_.z,1,_.A,_.B,1,_.bb,_.C,_.D,1,_.E,_.F,1,_.G,_.H,1,_.I,_.J,1,_.cb,_.K,_.L,1,_.M,_.N,1,_.O,_.P,1,_.Q,_.R,1,_.db,_.S,_.T,1,_.U,_.V,1,_.W,_.X,1,_.Y,_.Z],_.$.$hoisted_setHtml3=_._["__tests__/template.marko_0_$hoisted_setHtml3/hoist"](_.$),_.a.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.b),_.b["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.a),_.c.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.d),_.d["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.e.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.f),_.f["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.g.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.h),_.h["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.g),_.i.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.j),_.j["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.i),_.k.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.l),_.l["#TagVariable"]=_._["__tests__/template.marko_1_setHtml/var"](_.k),_.m.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.n),_.n["#TagVariable"]=_._["__tests__/template.marko_2_setHtml2/var"](_.m),_.o.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.p),_.p["#TagVariable"]=_._["__tests__/template.marko_2_setHtml2/var"](_.o),_.q.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.r),_.r["#TagVariable"]=_._["__tests__/template.marko_2_setHtml2/var"](_.q),_.s.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.t),_.t["#TagVariable"]=_._["__tests__/template.marko_2_setHtml2/var"](_.s),_.u.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.v),_.v["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.u),_.w.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.x),_.x["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.w),_.y.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.z),_.z["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.y),_.A.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.B),_.B["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.A),_.C.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.D),_.D["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.C),_.E.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.F),_.F["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.E),_.G.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.H),_.H["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.G),_.I.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.J),_.J["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.I),_.K.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.L),_.L["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.K),_.M.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.N),_.N["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.M),_.O.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.P),_.P["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.O),_.Q.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.R),_.R["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.Q),_.S.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.T),_.T["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.S),_.U.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.V),_.V["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.U),_.W.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.X),_.X["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.W),_.Y.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.Z),_.Z["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.Y),_.eb),"__tests__/template.marko_0_$hoisted_setHtml3 1 __tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -353,10 +353,7 @@
           ](_.Z), _.Z["#TagVariable"] = _._[
           "__tests__/template.marko_4_setHtml3/var"
           ](_.Y), _.eb),
-        "__tests__/template.marko_0_$hoisted_setHtml3",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_$hoisted_setHtml3 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/resume.expected.md
index 07cf03ea1..bb101900c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/resume.expected.md
@@ -61,12 +61,7 @@
           ](_.f), _.f["#TagVariable"] = _._[
           "__tests__/template.marko_4_setHtml3/var"
           ](_.e), _.j),
-        "__tests__/tags/thing.marko_0_input_value",
-        6,
-        "__tests__/template.marko_5",
-        13,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/tags/thing.marko_0_input_value 6 __tests__/template.marko_5 13 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/ssr.expected.md
index eda6bc92d..73f45851f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[--><div></div><!--M_*4 #div/0--><!--M_]3 #text/0 4--><!--M_[--><div></div><!--M_*8 #div/0--><!--M_]7 #text/0 8--><!--M_[--><div></div><!--M_*11 #div/0--><!--M_]10 #text/0 11--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.j=[0,_.i={"BranchScopes:#text/0":_.h={"BranchScopes:#text/0":_.a={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":5,setHtml:_.b={}}},"BranchScopes:#text/2":_.c={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":9,setHtml2:_.d={}},"BranchScopes:#text/3":_.e={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":12,setHtml3:_.f={}},"#childScope/1":_.g={}},_.h,_.a,_.b,1,_.g,_.c,_.d,1,_.e,_.f,1,{_:_.i}],_.g.input_value=_._["__tests__/template.marko_0_$hoisted_setHtml/hoist"](_.i),_.a.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.b),_.b["#TagVariable"]=_._["__tests__/template.marko_2_setHtml/var"](_.a),_.c.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.d),_.d["#TagVariable"]=_._["__tests__/template.marko_3_setHtml2/var"](_.c),_.e.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.f),_.f["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.e),_.j),"__tests__/tags/thing.marko_0_input_value",6,"__tests__/template.marko_5",13,"__tests__/template.marko_0",1];M._.w()</script>
+  <!--M_[--><div></div><!--M_*4 #div/0--><!--M_]3 #text/0 4--><!--M_[--><div></div><!--M_*8 #div/0--><!--M_]7 #text/0 8--><!--M_[--><div></div><!--M_*11 #div/0--><!--M_]10 #text/0 11--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.j=[0,_.i={"BranchScopes:#text/0":_.h={"BranchScopes:#text/0":_.a={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":5,setHtml:_.b={}}},"BranchScopes:#text/2":_.c={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":9,setHtml2:_.d={}},"BranchScopes:#text/3":_.e={"ConditionalRenderer:#text/0":"__tests__/tags/child.marko","#scopeOffset/1":12,setHtml3:_.f={}},"#childScope/1":_.g={}},_.h,_.a,_.b,1,_.g,_.c,_.d,1,_.e,_.f,1,{_:_.i}],_.g.input_value=_._["__tests__/template.marko_0_$hoisted_setHtml/hoist"](_.i),_.a.setHtml=_._["__tests__/tags/child.marko_0/_return"](_.b),_.b["#TagVariable"]=_._["__tests__/template.marko_2_setHtml/var"](_.a),_.c.setHtml2=_._["__tests__/tags/child.marko_0/_return"](_.d),_.d["#TagVariable"]=_._["__tests__/template.marko_3_setHtml2/var"](_.c),_.e.setHtml3=_._["__tests__/tags/child.marko_0/_return"](_.f),_.f["#TagVariable"]=_._["__tests__/template.marko_4_setHtml3/var"](_.e),_.j),"__tests__/tags/thing.marko_0_input_value 6 __tests__/template.marko_5 13 __tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -59,12 +59,7 @@
           ](_.f), _.f["#TagVariable"] = _._[
           "__tests__/template.marko_4_setHtml3/var"
           ](_.e), _.j),
-        "__tests__/tags/thing.marko_0_input_value",
-        6,
-        "__tests__/template.marko_5",
-        13,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/tags/thing.marko_0_input_value 6 __tests__/template.marko_5 13 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-script-read/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-script-read/__snapshots__/resume.expected.md
index 4d06a3721..c681ad8b6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-script-read/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-script-read/__snapshots__/resume.expected.md
@@ -11,8 +11,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-script-read/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-script-read/__snapshots__/ssr.expected.md
index 101fa1d2a..cc2c7426b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-script-read/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-script-read/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -14,8 +14,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/resume.expected.md
index b8c4dfdbd..511919712 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/resume.expected.md
@@ -55,14 +55,7 @@
             ](_.c), (_.e).add(_.f), _.e.add(_.g), (_.h).add(_.i), _.h.add(_
           .j), (_.k).add(_.b), (_.l).add(_.m), _.l.add(_.n), _.k.add(_.c), (_
             .o).add(_.p), _.d),
-        "__tests__/template.marko_2_$hoisted_el2",
-        6, 10,
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_$hoisted_el3",
-        1,
-        "__tests__/template.marko_0_$hoisted_el",
-        1
+        "__tests__/template.marko_2_$hoisted_el2 6 10 __tests__/template.marko_0 1 __tests__/template.marko_0_$hoisted_el3 1 __tests__/template.marko_0_$hoisted_el 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/ssr.expected.md
index 7228c9e4f..d742677bf 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <span></span><!--M_*3 #span/0--><span></span><!--M_*4 #span/0--><div></div><!--M_*8 #div/0--><div></div><!--M_*9 #div/0--><div></div><!--M_*12 #div/0--><div></div><!--M_*13 #div/0--><section><p></p><!--M_*15 #p/0--></section><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.a={"ClosureScopes:1":_.e=new Set,"ClosureScopes:2":_.k=new Set,"ClosureScopes:4":_.o=new Set},1,_.f={},_.g={},1,_.b={"ClosureScopes:3":_.h=new Set},1,_.i={},_.j={},_.c={"ClosureScopes:3":_.l=new Set},1,_.m={},_.n={},1,_.p={}],_.a.$hoisted_el=_._["__tests__/template.marko_0_$hoisted_el/hoist"](_.a),_.a.$hoisted_el3=_._["__tests__/template.marko_0_$hoisted_el3/hoist"](_.a),_.b.$hoisted_el2=_._["__tests__/template.marko_2_$hoisted_el2/hoist"](_.b),_.c.$hoisted_el2=_._["__tests__/template.marko_2_$hoisted_el2/hoist"](_.c),(_.e).add(_.f),_.e.add(_.g),(_.h).add(_.i),_.h.add(_.j),(_.k).add(_.b),(_.l).add(_.m),_.l.add(_.n),_.k.add(_.c),(_.o).add(_.p),_.d),"__tests__/template.marko_2_$hoisted_el2",6,10,"__tests__/template.marko_0",1,"__tests__/template.marko_0_$hoisted_el3",1,"__tests__/template.marko_0_$hoisted_el",1];M._.w()</script>
+  <span></span><!--M_*3 #span/0--><span></span><!--M_*4 #span/0--><div></div><!--M_*8 #div/0--><div></div><!--M_*9 #div/0--><div></div><!--M_*12 #div/0--><div></div><!--M_*13 #div/0--><section><p></p><!--M_*15 #p/0--></section><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.a={"ClosureScopes:1":_.e=new Set,"ClosureScopes:2":_.k=new Set,"ClosureScopes:4":_.o=new Set},1,_.f={},_.g={},1,_.b={"ClosureScopes:3":_.h=new Set},1,_.i={},_.j={},_.c={"ClosureScopes:3":_.l=new Set},1,_.m={},_.n={},1,_.p={}],_.a.$hoisted_el=_._["__tests__/template.marko_0_$hoisted_el/hoist"](_.a),_.a.$hoisted_el3=_._["__tests__/template.marko_0_$hoisted_el3/hoist"](_.a),_.b.$hoisted_el2=_._["__tests__/template.marko_2_$hoisted_el2/hoist"](_.b),_.c.$hoisted_el2=_._["__tests__/template.marko_2_$hoisted_el2/hoist"](_.c),(_.e).add(_.f),_.e.add(_.g),(_.h).add(_.i),_.h.add(_.j),(_.k).add(_.b),(_.l).add(_.m),_.l.add(_.n),_.k.add(_.c),(_.o).add(_.p),_.d),"__tests__/template.marko_2_$hoisted_el2 6 10 __tests__/template.marko_0 1 __tests__/template.marko_0_$hoisted_el3 1 __tests__/template.marko_0_$hoisted_el 1"];M._.w()</script>
 ```
 
 # Render End
@@ -45,14 +45,7 @@
             ](_.c), (_.e).add(_.f), _.e.add(_.g), (_.h).add(_.i), _.h.add(_
           .j), (_.k).add(_.b), (_.l).add(_.m), _.l.add(_.n), _.k.add(_.c), (_
             .o).add(_.p), _.d),
-        "__tests__/template.marko_2_$hoisted_el2",
-        6, 10,
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_$hoisted_el3",
-        1,
-        "__tests__/template.marko_0_$hoisted_el",
-        1
+        "__tests__/template.marko_2_$hoisted_el2 6 10 __tests__/template.marko_0 1 __tests__/template.marko_0_$hoisted_el3 1 __tests__/template.marko_0_$hoisted_el 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-many/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-many/__snapshots__/resume.expected.md
index 58c4ef736..a83dac92e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-many/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-many/__snapshots__/resume.expected.md
@@ -161,10 +161,7 @@
         ], _.a.$hoisted_el3 = _._[
           "__tests__/template.marko_0_$hoisted_el3/hoist"
           ](_.a), _.F),
-        "__tests__/template.marko_0_$hoisted_el3",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_$hoisted_el3 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-many/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-many/__snapshots__/ssr.expected.md
index 31872366d..6fe04e799 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-many/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-many/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*2 #div/0--><div></div><!--M_*3 #div/0--><div></div><!--M_*4 #div/0--><div></div><!--M_*5 #div/0--><div></div><!--M_*6 #div/0--><div></div><!--M_*7 #div/0--><hr><div></div><!--M_*8 #div/0--><div></div><!--M_*9 #div/0--><div></div><!--M_*10 #div/0--><div></div><!--M_*11 #div/0--><hr><ul><li data-index=0></li><!--M_*13 #li/0--><li data-index=1></li><!--M_*14 #li/0--><li data-index=2></li><!--M_*15 #li/0--><li data-index=3></li><!--M_*16 #li/0--></ul><ul><li data-index=4></li><!--M_*18 #li/0--><li data-index=5></li><!--M_*19 #li/0--><li data-index=6></li><!--M_*20 #li/0--><li data-index=7></li><!--M_*21 #li/0--></ul><ul><li data-index=8></li><!--M_*23 #li/0--><li data-index=9></li><!--M_*24 #li/0--><li data-index=10></li><!--M_*25 #li/0--><li data-index=11></li><!--M_*26 #li/0--></ul><ul><li data-index=12></li><!--M_*28 #li/0--><li data-index=13></li><!--M_*29 #li/0--><li data-index=14></li><!--M_*30 #li/0--><li data-index=15></li><!--M_*31 #li/0--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.F=[0,_.a={"BranchScopes:#text/0":[_.b={},_.c={},_.d={},_.e={},_.f={},_.g={}],"BranchScopes:#text/1":[_.h={},_.i={},_.j={},_.k={}],"BranchScopes:#text/2":[_.l={"BranchScopes:#ul/0":[_.m={},_.n={},_.o={},_.p={}]},_.q={"BranchScopes:#ul/0":[_.r={},_.s={},_.t={},_.u={}]},_.v={"BranchScopes:#ul/0":[_.w={},_.x={},_.y={},_.z={}]},_.A={"BranchScopes:#ul/0":[_.B={},_.C={},_.D={},_.E={}]}]},_.b,_.c,_.d,_.e,_.f,_.g,_.h,_.i,_.j,_.k,_.l,_.m,_.n,_.o,_.p,_.q,_.r,_.s,_.t,_.u,_.v,_.w,_.x,_.y,_.z,_.A,_.B,_.C,_.D,_.E],_.a.$hoisted_el3=_._["__tests__/template.marko_0_$hoisted_el3/hoist"](_.a),_.F),"__tests__/template.marko_0_$hoisted_el3",1,"__tests__/template.marko_0",1];M._.w()</script>
+  <div></div><!--M_*2 #div/0--><div></div><!--M_*3 #div/0--><div></div><!--M_*4 #div/0--><div></div><!--M_*5 #div/0--><div></div><!--M_*6 #div/0--><div></div><!--M_*7 #div/0--><hr><div></div><!--M_*8 #div/0--><div></div><!--M_*9 #div/0--><div></div><!--M_*10 #div/0--><div></div><!--M_*11 #div/0--><hr><ul><li data-index=0></li><!--M_*13 #li/0--><li data-index=1></li><!--M_*14 #li/0--><li data-index=2></li><!--M_*15 #li/0--><li data-index=3></li><!--M_*16 #li/0--></ul><ul><li data-index=4></li><!--M_*18 #li/0--><li data-index=5></li><!--M_*19 #li/0--><li data-index=6></li><!--M_*20 #li/0--><li data-index=7></li><!--M_*21 #li/0--></ul><ul><li data-index=8></li><!--M_*23 #li/0--><li data-index=9></li><!--M_*24 #li/0--><li data-index=10></li><!--M_*25 #li/0--><li data-index=11></li><!--M_*26 #li/0--></ul><ul><li data-index=12></li><!--M_*28 #li/0--><li data-index=13></li><!--M_*29 #li/0--><li data-index=14></li><!--M_*30 #li/0--><li data-index=15></li><!--M_*31 #li/0--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.F=[0,_.a={"BranchScopes:#text/0":[_.b={},_.c={},_.d={},_.e={},_.f={},_.g={}],"BranchScopes:#text/1":[_.h={},_.i={},_.j={},_.k={}],"BranchScopes:#text/2":[_.l={"BranchScopes:#ul/0":[_.m={},_.n={},_.o={},_.p={}]},_.q={"BranchScopes:#ul/0":[_.r={},_.s={},_.t={},_.u={}]},_.v={"BranchScopes:#ul/0":[_.w={},_.x={},_.y={},_.z={}]},_.A={"BranchScopes:#ul/0":[_.B={},_.C={},_.D={},_.E={}]}]},_.b,_.c,_.d,_.e,_.f,_.g,_.h,_.i,_.j,_.k,_.l,_.m,_.n,_.o,_.p,_.q,_.r,_.s,_.t,_.u,_.v,_.w,_.x,_.y,_.z,_.A,_.B,_.C,_.D,_.E],_.a.$hoisted_el3=_._["__tests__/template.marko_0_$hoisted_el3/hoist"](_.a),_.F),"__tests__/template.marko_0_$hoisted_el3 1 __tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -130,10 +130,7 @@
         ], _.a.$hoisted_el3 = _._[
           "__tests__/template.marko_0_$hoisted_el3/hoist"
           ](_.a), _.F),
-        "__tests__/template.marko_0_$hoisted_el3",
-        1,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0_$hoisted_el3 1 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-same-scope/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-same-scope/__snapshots__/resume.expected.md
index 1026a0ac5..840cfa528 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-same-scope/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-same-scope/__snapshots__/resume.expected.md
@@ -17,8 +17,7 @@
         }], _.a.value = _.b.value = _._[
           "__tests__/template.marko_0/#div"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input",
-        2, 3
+        "__tests__/tags/child.marko_0_input 2 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-same-scope/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-same-scope/__snapshots__/ssr.expected.md
index 85a09a1b2..a69a86809 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-same-scope/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-same-scope/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.d={},{input:_.a={}},{input:_.b={}}],_.a.value=_.b.value=_._["__tests__/template.marko_0/#div"](_.d),_.c),"__tests__/tags/child.marko_0_input",2,3];M._.w()</script>
+  <div></div><!--M_*1 #div/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.d={},{input:_.a={}},{input:_.b={}}],_.a.value=_.b.value=_._["__tests__/template.marko_0/#div"](_.d),_.c),"__tests__/tags/child.marko_0_input 2 3"];M._.w()</script>
 ```
 
 # Render End
@@ -21,8 +21,7 @@
         }], _.a.value = _.b.value = _._[
           "__tests__/template.marko_0/#div"
           ](_.d), _.c),
-        "__tests__/tags/child.marko_0_input",
-        2, 3
+        "__tests__/tags/child.marko_0_input 2 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/resume.expected.md
index 39cb279ff..3e405c5c9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/resume.expected.md
@@ -33,10 +33,7 @@
           ](_.h), _.d.value = _._[
           "__tests__/template.marko_2/#div"
           ](_.c), _.g),
-        "__tests__/tags/child.marko_0_input",
-        4, 5,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/tags/child.marko_0_input 4 5 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/ssr.expected.md
index ad0d6388b..88339fd27 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*3 #div/0--><hr><div></div><!--M_*6 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.g=[0,_.h={"BranchScopes:#text/0":_.b={"BranchScopes:#text/0":_.c={}},"BranchScopes:#text/2":_.f={},"#childScope/1":_.e={input:_.a={}}},_.b,_.c,{input:_.d={}},_.e,_.f],_.a.value=_._["__tests__/template.marko_0_$hoisted_el/hoist"](_.h),_.d.value=_._["__tests__/template.marko_2/#div"](_.c),_.g),"__tests__/tags/child.marko_0_input",4,5,"__tests__/template.marko_0",1];M._.w()</script>
+  <div></div><!--M_*3 #div/0--><hr><div></div><!--M_*6 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.g=[0,_.h={"BranchScopes:#text/0":_.b={"BranchScopes:#text/0":_.c={}},"BranchScopes:#text/2":_.f={},"#childScope/1":_.e={input:_.a={}}},_.b,_.c,{input:_.d={}},_.e,_.f],_.a.value=_._["__tests__/template.marko_0_$hoisted_el/hoist"](_.h),_.d.value=_._["__tests__/template.marko_2/#div"](_.c),_.g),"__tests__/tags/child.marko_0_input 4 5 __tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -31,10 +31,7 @@
           ](_.h), _.d.value = _._[
           "__tests__/template.marko_2/#div"
           ](_.c), _.g),
-        "__tests__/tags/child.marko_0_input",
-        4, 5,
-        "__tests__/template.marko_0",
-        1
+        "__tests__/tags/child.marko_0_input 4 5 __tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/resume.expected.md
index 4b5e537ea..aae0231d9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/resume.expected.md
@@ -18,8 +18,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -51,8 +50,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -89,8 +87,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -127,8 +124,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/ssr.expected.md
index b3243db8c..f3df36ab6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--0 + 0 = 0--><!--M_*1 #comment/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count",1];M._.w()</script>
+  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--0 + 0 = 0--><!--M_*1 #comment/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -23,8 +23,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/resume.expected.md
index d20a20ce7..448b66a39 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/resume.expected.md
@@ -27,8 +27,7 @@
           ](_.d), _.b["#TagVariable"] = _._[
           "__tests__/template.marko_0_spanName/var"
           ](_.d), _.c),
-        "__tests__/tags/parent-el.marko_0",
-        2, 4
+        "__tests__/tags/parent-el.marko_0 2 4"
       ];
       M._.w()
     </script>
@@ -66,8 +65,7 @@
           ](_.d), _.b["#TagVariable"] = _._[
           "__tests__/template.marko_0_spanName/var"
           ](_.d), _.c),
-        "__tests__/tags/parent-el.marko_0",
-        2, 4
+        "__tests__/tags/parent-el.marko_0 2 4"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/ssr.expected.md
index 1906e4a2f..276f0f531 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><!--Body Text--><!--M_*2 #comment/0-->&zwj;<!--M_*1 #text/2--></div><span><!--Body Text--><!--M_*4 #comment/0-->&zwj;<!--M_*1 #text/5--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.d={"#scopeOffset/1":3,"#scopeOffset/4":5,"#childScope/0":_.a={},"#childScope/3":_.b={}},_.a,1,_.b],_.a["#TagVariable"]=_._["__tests__/template.marko_0_divName/var"](_.d),_.b["#TagVariable"]=_._["__tests__/template.marko_0_spanName/var"](_.d),_.c),"__tests__/tags/parent-el.marko_0",2,4];M._.w()</script>
+  <div><!--Body Text--><!--M_*2 #comment/0-->&zwj;<!--M_*1 #text/2--></div><span><!--Body Text--><!--M_*4 #comment/0-->&zwj;<!--M_*1 #text/5--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.d={"#scopeOffset/1":3,"#scopeOffset/4":5,"#childScope/0":_.a={},"#childScope/3":_.b={}},_.a,1,_.b],_.a["#TagVariable"]=_._["__tests__/template.marko_0_divName/var"](_.d),_.b["#TagVariable"]=_._["__tests__/template.marko_0_spanName/var"](_.d),_.c),"__tests__/tags/parent-el.marko_0 2 4"];M._.w()</script>
 ```
 
 # Render End
@@ -32,8 +32,7 @@
           ](_.d), _.b["#TagVariable"] = _._[
           "__tests__/template.marko_0_spanName/var"
           ](_.d), _.c),
-        "__tests__/tags/parent-el.marko_0",
-        2, 4
+        "__tests__/tags/parent-el.marko_0 2 4"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-script-nonce/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/html-script-nonce/__snapshots__/ssr.expected.md
index a12e30e23..9cff3c61e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-script-nonce/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-script-nonce/__snapshots__/ssr.expected.md
@@ -6,7 +6,7 @@
     B
   </script><script nonce=override-spread type=magic>
     C
-  </script><!--M_*1 #script/0--><script nonce=default-nonce>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{spreadAttrs:{nonce:"override-spread"}}]),"__tests__/template.marko_0_spreadAttrs",1];M._.w()</script>
+  </script><!--M_*1 #script/0--><script nonce=default-nonce>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{spreadAttrs:{nonce:"override-spread"}}]),"__tests__/template.marko_0_spreadAttrs 1"];M._.w()</script>
 ```
 
 # Render End
@@ -43,8 +43,7 @@
             nonce: "override-spread"
           }
         }]),
-        "__tests__/template.marko_0_spreadAttrs",
-        1
+        "__tests__/template.marko_0_spreadAttrs 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-script/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/html-script/__snapshots__/resume.expected.md
index 6535c17f3..1fb897bcb 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-script/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-script/__snapshots__/resume.expected.md
@@ -25,8 +25,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -65,8 +64,7 @@ container.querySelector("script").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -111,8 +109,7 @@ container.querySelector("script").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -157,8 +154,7 @@ container.querySelector("script").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-script/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/html-script/__snapshots__/ssr.expected.md
index 8819541c1..73eede1f2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-script/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-script/__snapshots__/ssr.expected.md
@@ -6,7 +6,7 @@
         "0": "https://markojs.com",
       }
     }
-  </script><!--M_*1 #script/0--><div>0<!--M_*1 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count",1];M._.w()</script>
+  </script><!--M_*1 #script/0--><div>0<!--M_*1 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -36,8 +36,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-style-nonce/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/html-style-nonce/__snapshots__/ssr.expected.md
index 2a94908a2..166121323 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-style-nonce/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-style-nonce/__snapshots__/ssr.expected.md
@@ -6,7 +6,7 @@
     B {}
   </style><style nonce=override-spread>
     C {}
-  </style><!--M_*1 #style/0--><script nonce=default-nonce>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{spreadAttrs:{nonce:"override-spread"}}]),"__tests__/template.marko_0_spreadAttrs",1];M._.w()</script>
+  </style><!--M_*1 #style/0--><script nonce=default-nonce>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{spreadAttrs:{nonce:"override-spread"}}]),"__tests__/template.marko_0_spreadAttrs 1"];M._.w()</script>
 ```
 
 # Render End
@@ -46,8 +46,7 @@
             nonce: "override-spread"
           }
         }]),
-        "__tests__/template.marko_0_spreadAttrs",
-        1
+        "__tests__/template.marko_0_spreadAttrs 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-style/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/html-style/__snapshots__/resume.expected.md
index c56f093bc..fe759753a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-style/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-style/__snapshots__/resume.expected.md
@@ -16,8 +16,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -48,8 +47,7 @@ container.querySelector("style").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -85,8 +83,7 @@ container.querySelector("style").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -122,8 +119,7 @@ container.querySelector("style").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-style/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/html-style/__snapshots__/ssr.expected.md
index 9259a3aaa..21785bac0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-style/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-style/__snapshots__/ssr.expected.md
@@ -4,7 +4,7 @@
     .test {
       content: 0
     }
-  </style><!--M_*1 #style/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count",1];M._.w()</script>
+  </style><!--M_*1 #style/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -25,8 +25,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/id-tag-default/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/id-tag-default/__snapshots__/resume.expected.md
index d88faf92e..e62df5574 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/id-tag-default/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/id-tag-default/__snapshots__/resume.expected.md
@@ -30,8 +30,7 @@
         {
           baz: "baz"
         }]),
-        "__tests__/template.marko_0_bar_baz",
-        1
+        "__tests__/template.marko_0_bar_baz 1"
       ];
       M._.w()
     </script>
@@ -75,8 +74,7 @@ container.querySelector("button").click();
         {
           baz: "baz"
         }]),
-        "__tests__/template.marko_0_bar_baz",
-        1
+        "__tests__/template.marko_0_bar_baz 1"
       ];
       M._.w()
     </script>
@@ -125,8 +123,7 @@ container.querySelector("button").click();
         {
           baz: "baz"
         }]),
-        "__tests__/template.marko_0_bar_baz",
-        1
+        "__tests__/template.marko_0_bar_baz 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/id-tag-default/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/id-tag-default/__snapshots__/ssr.expected.md
index 8b2791f79..b33d5c2ca 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/id-tag-default/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/id-tag-default/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>toggle</button><!--M_*1 #button/0--><div id=foo>foo</div><div id=sM_1>bar</div><!--M_*1 #div/2--><div id=baz>baz</div><!--M_*1 #div/3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{baz:"baz"}]),"__tests__/template.marko_0_bar_baz",1];M._.w()</script>
+  <button>toggle</button><!--M_*1 #button/0--><div id=foo>foo</div><div id=sM_1>bar</div><!--M_*1 #div/2--><div id=baz>baz</div><!--M_*1 #div/3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{baz:"baz"}]),"__tests__/template.marko_0_bar_baz 1"];M._.w()</script>
 ```
 
 # Render End
@@ -35,8 +35,7 @@
         {
           baz: "baz"
         }]),
-        "__tests__/template.marko_0_bar_baz",
-        1
+        "__tests__/template.marko_0_bar_baz 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/if-default-false/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/if-default-false/__snapshots__/resume.expected.md
index 8967ba181..eae9e11bc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/if-default-false/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/if-default-false/__snapshots__/resume.expected.md
@@ -13,8 +13,7 @@
         {
           show: !1
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -41,8 +40,7 @@ container.querySelector("button").click();
         {
           show: !1
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -74,8 +72,7 @@ container.querySelector("button").click();
         {
           show: !1
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
@@ -107,8 +104,7 @@ container.querySelector("button").click();
         {
           show: !1
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/if-default-false/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/if-default-false/__snapshots__/ssr.expected.md
index 6031382e9..73c3ec694 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/if-default-false/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/if-default-false/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button></button><!--M_*1 #button/0--><!--M_[--><!--M_]1 #text/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{show:!1}]),"__tests__/template.marko_0_show",1];M._.w()</script>
+  <button></button><!--M_*1 #button/0--><!--M_[--><!--M_]1 #text/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{show:!1}]),"__tests__/template.marko_0_show 1"];M._.w()</script>
 ```
 
 # Render End
@@ -18,8 +18,7 @@
         {
           show: !1
         }]),
-        "__tests__/template.marko_0_show",
-        1
+        "__tests__/template.marko_0_show 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/if-member-expression-intersection/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/if-member-expression-intersection/__snapshots__/resume.expected.md
index ea0b0eb01..711d78542 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/if-member-expression-intersection/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/if-member-expression-intersection/__snapshots__/resume.expected.md
@@ -28,8 +28,7 @@
           text_length: 0,
           id: "sM_2"
         }]),
-        "__tests__/tags/child.marko_0_id",
-        2, 3
+        "__tests__/tags/child.marko_0_id 2 3"
       ];
       M._.w()
     </script>
@@ -74,8 +73,7 @@
           text_length: 0,
           id: "sM_2"
         }]),
-        "__tests__/tags/child.marko_0_id",
-        2, 3
+        "__tests__/tags/child.marko_0_id 2 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/if-member-expression-intersection/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/if-member-expression-intersection/__snapshots__/ssr.expected.md
index aa493222a..fa469a19e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/if-member-expression-intersection/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/if-member-expression-intersection/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div id=sM_1><!--M_}2 #div/0--></div><div id=sM_2><!--M_}3 #div/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,1,{hide:!0,text:"",text_length:0,id:"sM_1"},{hide:!0,text:"",text_length:0,id:"sM_2"}]),"__tests__/tags/child.marko_0_id",2,3];M._.w()</script>
+  <div id=sM_1><!--M_}2 #div/0--></div><div id=sM_2><!--M_}3 #div/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,1,{hide:!0,text:"",text_length:0,id:"sM_1"},{hide:!0,text:"",text_length:0,id:"sM_2"}]),"__tests__/tags/child.marko_0_id 2 3"];M._.w()</script>
 ```
 
 # Render End
@@ -33,8 +33,7 @@
           text_length: 0,
           id: "sM_2"
         }]),
-        "__tests__/tags/child.marko_0_id",
-        2, 3
+        "__tests__/tags/child.marko_0_id 2 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/if-no-content-script/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/if-no-content-script/__snapshots__/resume.expected.md
index b757cfaa5..d987a61a3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/if-no-content-script/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/if-no-content-script/__snapshots__/resume.expected.md
@@ -22,10 +22,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -64,10 +61,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -109,10 +103,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -151,10 +142,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/if-no-content-script/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/if-no-content-script/__snapshots__/ssr.expected.md
index a0cdb2ba8..e8b7be455 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/if-no-content-script/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/if-no-content-script/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><button>0<!--M_*1 #text/2--></button><!--M_*1 #button/1--><!--M_[--><!--M_]1 #text/3 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={count:0},{_:_.a}]),"__tests__/template.marko_1",2,"__tests__/template.marko_0_count",1];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><button>0<!--M_*1 #text/2--></button><!--M_*1 #button/1--><!--M_[--><!--M_]1 #text/3 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={count:0},{_:_.a}]),"__tests__/template.marko_1 2 __tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -25,10 +25,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_1 2 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/inert-control-flow-only-child-event/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/inert-control-flow-only-child-event/__snapshots__/resume.expected.md
index 273eb5b49..fc404b9a5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/inert-control-flow-only-child-event/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/inert-control-flow-only-child-event/__snapshots__/resume.expected.md
@@ -35,8 +35,7 @@
           i: 2,
           _: _.a
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -89,8 +88,7 @@ select.dispatchEvent(new select.ownerDocument.defaultView.Event("change", {
           i: 2,
           _: _.a
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/inert-control-flow-only-child-event/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/inert-control-flow-only-child-event/__snapshots__/ssr.expected.md
index b066625dd..c8797580d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/inert-control-flow-only-child-event/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/inert-control-flow-only-child-event/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <select><option selected>0</option><!--M_*2 #option/0--><option>1</option><!--M_*3 #option/0--><option>2</option><!--M_*4 #option/0--></select><!--M_*1 #select/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={},{i:0,_:_.a},{i:1,_:_.a},{i:2,_:_.a}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <select><option selected>0</option><!--M_*2 #option/0--><option>1</option><!--M_*3 #option/0--><option>2</option><!--M_*4 #option/0--></select><!--M_*1 #select/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={},{i:0,_:_.a},{i:1,_:_.a},{i:2,_:_.a}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -40,8 +40,7 @@
           i: 2,
           _: _.a
         }]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-active/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-active/__snapshots__/resume.expected.md
index 4728c1126..010af61a1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-active/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-active/__snapshots__/resume.expected.md
@@ -15,8 +15,7 @@
       M._.r = [_ =&gt; (_.c = [0, _.a = {
           "BranchScopes:#text/0": _.b = {}
         }, _.b], _.b._ = _.a, _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -44,8 +43,7 @@ container.querySelector("button").click();
       M._.r = [_ =&gt; (_.c = [0, _.a = {
           "BranchScopes:#text/0": _.b = {}
         }, _.b], _.b._ = _.a, _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-active/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-active/__snapshots__/ssr.expected.md
index 576ee9854..1724d4b8b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-active/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-active/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  0<!--M_*2 #text/0--><button>Update</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"BranchScopes:#text/0":_.b={}},_.b],_.b._=_.a,_.c),"__tests__/template.marko_0",1];M._.w()</script>
+  0<!--M_*2 #text/0--><button>Update</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"BranchScopes:#text/0":_.b={}},_.b],_.b._=_.a,_.c),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -19,8 +19,7 @@
       M._.r = [_ =&gt; (_.c = [0, _.a = {
           "BranchScopes:#text/0": _.b = {}
         }, _.b], _.b._ = _.a, _.c),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-inactive/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-inactive/__snapshots__/resume.expected.md
index ea0b996e5..fa54fee78 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-inactive/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-inactive/__snapshots__/resume.expected.md
@@ -12,8 +12,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -38,8 +37,7 @@ container.querySelector("button").click();
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-inactive/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-inactive/__snapshots__/ssr.expected.md
index adbf29fa5..015da56d5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-inactive/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/inert-if-closure-update-inactive/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Update</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <button>Update</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -16,8 +16,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/known-tag-param-serialize-alias/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/known-tag-param-serialize-alias/__snapshots__/resume.expected.md
index 7753f8ab2..0ad65db67 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/known-tag-param-serialize-alias/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/known-tag-param-serialize-alias/__snapshots__/resume.expected.md
@@ -16,10 +16,7 @@
         {
           input_a: "a"
         }]),
-        "__tests__/template.marko_1_input_a",
-        2,
-        "__tests__/template.marko_1_a",
-        2
+        "__tests__/template.marko_1_input_a 2 __tests__/template.marko_1_a 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/known-tag-param-serialize-alias/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/known-tag-param-serialize-alias/__snapshots__/ssr.expected.md
index ac62a6429..db3fe61c6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/known-tag-param-serialize-alias/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/known-tag-param-serialize-alias/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>a</div><div>b</div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,1,{input_a:"a"}]),"__tests__/template.marko_1_input_a",2,"__tests__/template.marko_1_a",2];M._.w()</script>
+  <div>a</div><div>b</div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,1,{input_a:"a"}]),"__tests__/template.marko_1_input_a 2 __tests__/template.marko_1_a 2"];M._.w()</script>
 ```
 
 # Render End
@@ -20,10 +20,7 @@
         {
           input_a: "a"
         }]),
-        "__tests__/template.marko_1_input_a",
-        2,
-        "__tests__/template.marko_1_a",
-        2
+        "__tests__/template.marko_1_input_a 2 __tests__/template.marko_1_a 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-basic-member-expression-never-update/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-basic-member-expression-never-update/__snapshots__/resume.expected.md
index 8da521d24..4b3608186 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-basic-member-expression-never-update/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-basic-member-expression-never-update/__snapshots__/resume.expected.md
@@ -16,8 +16,7 @@
         {
           index: -1
         }]),
-        "__tests__/template.marko_0_index",
-        1
+        "__tests__/template.marko_0_index 1"
       ];
       M._.w()
     </script>
@@ -47,8 +46,7 @@ container.querySelector("button").click();
         {
           index: -1
         }]),
-        "__tests__/template.marko_0_index",
-        1
+        "__tests__/template.marko_0_index 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-basic-member-expression-never-update/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-basic-member-expression-never-update/__snapshots__/ssr.expected.md
index 8f73b18f5..73293d608 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-basic-member-expression-never-update/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-basic-member-expression-never-update/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>&zwj;</div><button>Update</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{index:-1}]),"__tests__/template.marko_0_index",1];M._.w()</script>
+  <div>&zwj;</div><button>Update</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{index:-1}]),"__tests__/template.marko_0_index 1"];M._.w()</script>
 ```
 
 # Render End
@@ -21,8 +21,7 @@
         {
           index: -1
         }]),
-        "__tests__/template.marko_0_index",
-        1
+        "__tests__/template.marko_0_index 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-bind-stateful-upstream-alias/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-bind-stateful-upstream-alias/__snapshots__/resume.expected.md
index 5c520384d..73ea9ebca 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-bind-stateful-upstream-alias/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-bind-stateful-upstream-alias/__snapshots__/resume.expected.md
@@ -37,8 +37,7 @@
           ](_.b), _.b["#TagVariable"] = _._[
           "__tests__/template.marko_0_store/var"
           ](_.a), _.c),
-        "__tests__/template.marko_0_store_clear",
-        1
+        "__tests__/template.marko_0_store_clear 1"
       ];
       M._.w()
     </script>
@@ -81,8 +80,7 @@ container.querySelector("button").click();
           ](_.b), _.b["#TagVariable"] = _._[
           "__tests__/template.marko_0_store/var"
           ](_.a), _.c),
-        "__tests__/template.marko_0_store_clear",
-        1
+        "__tests__/template.marko_0_store_clear 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-bind-stateful-upstream-alias/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-bind-stateful-upstream-alias/__snapshots__/ssr.expected.md
index 23c909544..348c0aaf9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-bind-stateful-upstream-alias/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-bind-stateful-upstream-alias/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Clear</button><!--M_*1 #button/2--><ul><li>Learn Marko<!--M_*4 #text/0--></li><li>Make a Website<!--M_*5 #text/0--></li><!--M_}1 #ul/3 5 4--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"#scopeOffset/1":3,store_clear:_.b={},"#childScope/0":_.b},_.b,1,{"#LoopKey":0},{"#LoopKey":1}],_.a["TagVariableChange:list"]=_._["__tests__/tags/store.marko_0/_return"](_.b),_.a.store_clear=_._["__tests__/tags/store.marko_0/_return2"](_.b),_.b["#TagVariable"]=_._["__tests__/template.marko_0_store/var"](_.a),_.c),"__tests__/template.marko_0_store_clear",1];M._.w()</script>
+  <button>Clear</button><!--M_*1 #button/2--><ul><li>Learn Marko<!--M_*4 #text/0--></li><li>Make a Website<!--M_*5 #text/0--></li><!--M_}1 #ul/3 5 4--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"#scopeOffset/1":3,store_clear:_.b={},"#childScope/0":_.b},_.b,1,{"#LoopKey":0},{"#LoopKey":1}],_.a["TagVariableChange:list"]=_._["__tests__/tags/store.marko_0/_return"](_.b),_.a.store_clear=_._["__tests__/tags/store.marko_0/_return2"](_.b),_.b["#TagVariable"]=_._["__tests__/template.marko_0_store/var"](_.a),_.c),"__tests__/template.marko_0_store_clear 1"];M._.w()</script>
 ```
 
 # Render End
@@ -42,8 +42,7 @@
           ](_.b), _.b["#TagVariable"] = _._[
           "__tests__/template.marko_0_store/var"
           ](_.a), _.c),
-        "__tests__/template.marko_0_store_clear",
-        1
+        "__tests__/template.marko_0_store_clear 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/resume.expected.md
index 40c6a998e..ed228a641 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/resume.expected.md
@@ -37,10 +37,7 @@
           .a["TagVariableChange:otherState"] = _._[
             "__tests__/template.marko_0/valueChange"
             ](_.c), _.b),
-        "__tests__/tags/child.marko_0_otherState",
-        2,
-        "__tests__/tags/child.marko_0_state",
-        2
+        "__tests__/tags/child.marko_0_otherState 2 __tests__/tags/child.marko_0_state 2"
       ];
       M._.w()
     </script>
@@ -91,10 +88,7 @@ container.querySelectorAll("button").forEach(item => item.click());
           .a["TagVariableChange:otherState"] = _._[
             "__tests__/template.marko_0/valueChange"
             ](_.c), _.b),
-        "__tests__/tags/child.marko_0_otherState",
-        2,
-        "__tests__/tags/child.marko_0_state",
-        2
+        "__tests__/tags/child.marko_0_otherState 2 __tests__/tags/child.marko_0_state 2"
       ];
       M._.w()
     </script>
@@ -153,10 +147,7 @@ container.querySelectorAll("button").forEach(item => item.click());
           .a["TagVariableChange:otherState"] = _._[
             "__tests__/template.marko_0/valueChange"
             ](_.c), _.b),
-        "__tests__/tags/child.marko_0_otherState",
-        2,
-        "__tests__/tags/child.marko_0_state",
-        2
+        "__tests__/tags/child.marko_0_otherState 2 __tests__/tags/child.marko_0_state 2"
       ];
       M._.w()
     </script>
@@ -215,10 +206,7 @@ container.querySelectorAll("button").forEach(item => item.click());
           .a["TagVariableChange:otherState"] = _._[
             "__tests__/template.marko_0/valueChange"
             ](_.c), _.b),
-        "__tests__/tags/child.marko_0_otherState",
-        2,
-        "__tests__/tags/child.marko_0_state",
-        2
+        "__tests__/tags/child.marko_0_otherState 2 __tests__/tags/child.marko_0_state 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/ssr.expected.md
index 037fb6428..61e54539c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>1<!--M_*2 #text/1-->|<!>1<!--M_*2 #text/2--></button><!--M_*2 #button/0--><button>1<!--M_*2 #text/4-->|<!>1<!--M_*2 #text/5--></button><!--M_*2 #button/3-->source=<!>1<!--M_*1 #text/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"#childScope/0":_.a={input_value:1,state:1,otherState:1}},_.a],_.a.input_valueChange=_.a["TagVariableChange:state"]=_.a["TagVariableChange:otherState"]=_._["__tests__/template.marko_0/valueChange"](_.c),_.b),"__tests__/tags/child.marko_0_otherState",2,"__tests__/tags/child.marko_0_state",2];M._.w()</script>
+  <button>1<!--M_*2 #text/1-->|<!>1<!--M_*2 #text/2--></button><!--M_*2 #button/0--><button>1<!--M_*2 #text/4-->|<!>1<!--M_*2 #text/5--></button><!--M_*2 #button/3-->source=<!>1<!--M_*1 #text/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"#childScope/0":_.a={input_value:1,state:1,otherState:1}},_.a],_.a.input_valueChange=_.a["TagVariableChange:state"]=_.a["TagVariableChange:otherState"]=_._["__tests__/template.marko_0/valueChange"](_.c),_.b),"__tests__/tags/child.marko_0_otherState 2 __tests__/tags/child.marko_0_state 2"];M._.w()</script>
 ```
 
 # Render End
@@ -42,10 +42,7 @@
           .a["TagVariableChange:otherState"] = _._[
             "__tests__/template.marko_0/valueChange"
             ](_.c), _.b),
-        "__tests__/tags/child.marko_0_otherState",
-        2,
-        "__tests__/tags/child.marko_0_state",
-        2
+        "__tests__/tags/child.marko_0_otherState 2 __tests__/tags/child.marko_0_state 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-dynamic-change-handler/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-dynamic-change-handler/__snapshots__/resume.expected.md
index d0d402725..5cd2ee261 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-dynamic-change-handler/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-dynamic-change-handler/__snapshots__/resume.expected.md
@@ -28,10 +28,7 @@
         }], _.a.yChange = _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/yChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
@@ -73,10 +70,7 @@ container.querySelector("#inc").click();
         }], _.a.yChange = _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/yChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
@@ -123,10 +117,7 @@ container.querySelector("#inc").click();
         }], _.a.yChange = _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/yChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
@@ -173,10 +164,7 @@ container.querySelector("#toggle").click();
         }], _.a.yChange = _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/yChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
@@ -218,10 +206,7 @@ container.querySelector("#inc").click();
         }], _.a.yChange = _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/yChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
@@ -267,10 +252,7 @@ container.querySelector("#inc").click();
         }], _.a.yChange = _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/yChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-dynamic-change-handler/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-dynamic-change-handler/__snapshots__/ssr.expected.md
index 34da9e525..cb2ea13cd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-dynamic-change-handler/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-dynamic-change-handler/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button id=inc>1<!--M_*1 #text/1-->|<!>1<!--M_*1 #text/2--></button><!--M_*1 #button/0--><button id=toggle>toggle</button><!--M_*1 #button/3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={x:1,y:1}],_.a.yChange=_.a["TagVariableChange:y"]=_._["__tests__/template.marko_0/yChange"](_.a),_.b),"__tests__/template.marko_0",1,"__tests__/template.marko_0_y",1];M._.w()</script>
+  <button id=inc>1<!--M_*1 #text/1-->|<!>1<!--M_*1 #text/2--></button><!--M_*1 #button/0--><button id=toggle>toggle</button><!--M_*1 #button/3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={x:1,y:1}],_.a.yChange=_.a["TagVariableChange:y"]=_._["__tests__/template.marko_0/yChange"](_.a),_.b),"__tests__/template.marko_0 1 __tests__/template.marko_0_y 1"];M._.w()</script>
 ```
 
 # Render End
@@ -33,10 +33,7 @@
         }], _.a.yChange = _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/yChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/resume.expected.md
index 4626a1e6d..ee5354002 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
         }], _.a.handler = _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/handler"
           ](_.a), _.b),
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
@@ -53,8 +52,7 @@ container.querySelector("button").click();
         }], _.a.handler = _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/handler"
           ](_.a), _.b),
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
@@ -92,8 +90,7 @@ container.querySelector("button").click();
         }], _.a.handler = _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/handler"
           ](_.a), _.b),
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
@@ -131,8 +128,7 @@ container.querySelector("button").click();
         }], _.a.handler = _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/handler"
           ](_.a), _.b),
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/ssr.expected.md
index d2575f6f0..6b47eef1f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>1<!--M_*1 #text/1-->|<!>1<!--M_*1 #text/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={y:1}],_.a.handler=_.a["TagVariableChange:y"]=_._["__tests__/template.marko_0/handler"](_.a),_.b),"__tests__/template.marko_0_y",1];M._.w()</script>
+  <button>1<!--M_*1 #text/1-->|<!>1<!--M_*1 #text/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={y:1}],_.a.handler=_.a["TagVariableChange:y"]=_._["__tests__/template.marko_0/handler"](_.a),_.b),"__tests__/template.marko_0_y 1"];M._.w()</script>
 ```
 
 # Render End
@@ -24,8 +24,7 @@
         }], _.a.handler = _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/handler"
           ](_.a), _.b),
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/resume.expected.md
index 4916ecb16..75d558b2a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
         }], _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
@@ -53,8 +52,7 @@ container.querySelector("button").click();
         }], _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
@@ -92,8 +90,7 @@ container.querySelector("button").click();
         }], _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
@@ -131,8 +128,7 @@ container.querySelector("button").click();
         }], _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/ssr.expected.md
index 86b4ec4df..116ab67d2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>1<!--M_*1 #text/1-->|<!>1<!--M_*1 #text/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={y:1}],_.a["TagVariableChange:y"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0_y",1];M._.w()</script>
+  <button>1<!--M_*1 #text/1-->|<!>1<!--M_*1 #text/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={y:1}],_.a["TagVariableChange:y"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0_y 1"];M._.w()</script>
 ```
 
 # Render End
@@ -24,8 +24,7 @@
         }], _.a["TagVariableChange:y"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0_y",
-        1
+        "__tests__/template.marko_0_y 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/resume.expected.md
index a782ceb55..55db8ac66 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/resume.expected.md
@@ -18,8 +18,7 @@
         {
           b: 4
         }]),
-        "__tests__/template.marko_0_b",
-        1
+        "__tests__/template.marko_0_b 1"
       ];
       M._.w()
     </script>
@@ -50,8 +49,7 @@ container.querySelector("button").click();
         {
           b: 4
         }]),
-        "__tests__/template.marko_0_b",
-        1
+        "__tests__/template.marko_0_b 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/ssr.expected.md
index d9c340e14..ef88614ea 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Increment</button><!--M_*1 #button/0-->2 <!>4<!--M_*1 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{b:4}]),"__tests__/template.marko_0_b",1];M._.w()</script>
+  <button>Increment</button><!--M_*1 #button/0-->2 <!>4<!--M_*1 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{b:4}]),"__tests__/template.marko_0_b 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
         {
           b: 4
         }]),
-        "__tests__/template.marko_0_b",
-        1
+        "__tests__/template.marko_0_b 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/resume.expected.md
index e0204bcc6..e64f86bdc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/resume.expected.md
@@ -17,8 +17,7 @@
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -46,8 +45,7 @@
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -80,8 +78,7 @@ UPDATE html/body/span1/#text "0" => "1"
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/ssr.expected.md
index be6c2df50..40080610b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <span>1<!--M_*1 #text/0--></span><span>0<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:1}]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <span>1<!--M_*1 #text/0--></span><span>0<!--M_*1 #text/1--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:1}]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/resume.expected.md
index 2101e9e77..40e1c2173 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/resume.expected.md
@@ -24,8 +24,7 @@
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -63,8 +62,7 @@ container.querySelector("button").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -109,8 +107,7 @@ container.querySelector("button").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -155,8 +152,7 @@ container.querySelector("button").click();
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/ssr.expected.md
index dabe77c80..74c875f26 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>1<!--M_*1 #text/1--></button><!--M_*1 #button/0-->2<!--M_*1 #text/2--> <!>3<!--M_*1 #text/3--> <!>5<!--M_*1 #text/4--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:1}]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <button>1<!--M_*1 #text/1--></button><!--M_*1 #button/0-->2<!--M_*1 #text/2--> <!>3<!--M_*1 #text/3--> <!>5<!--M_*1 #text/4--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:1}]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -29,8 +29,7 @@
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag/__snapshots__/resume.expected.md
index 846a616b1..cc7cee94e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag/__snapshots__/resume.expected.md
@@ -17,8 +17,7 @@
           x: 1,
           y: 1
         }]),
-        "__tests__/template.marko_0_x_y",
-        1
+        "__tests__/template.marko_0_x_y 1"
       ];
       M._.w()
     </script>
@@ -49,8 +48,7 @@ container.querySelector("button").click();
           x: 1,
           y: 1
         }]),
-        "__tests__/template.marko_0_x_y",
-        1
+        "__tests__/template.marko_0_x_y 1"
       ];
       M._.w()
     </script>
@@ -86,8 +84,7 @@ container.querySelector("button").click();
           x: 1,
           y: 1
         }]),
-        "__tests__/template.marko_0_x_y",
-        1
+        "__tests__/template.marko_0_x_y 1"
       ];
       M._.w()
     </script>
@@ -123,8 +120,7 @@ container.querySelector("button").click();
           x: 1,
           y: 1
         }]),
-        "__tests__/template.marko_0_x_y",
-        1
+        "__tests__/template.marko_0_x_y 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag/__snapshots__/ssr.expected.md
index 5fd7fdd3a..411e94642 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>1<!--M_*1 #text/1--></button><!--M_*1 #button/0-->1<!--M_*1 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:1,y:1}]),"__tests__/template.marko_0_x_y",1];M._.w()</script>
+  <button>1<!--M_*1 #text/1--></button><!--M_*1 #button/0-->1<!--M_*1 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:1,y:1}]),"__tests__/template.marko_0_x_y 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
           x: 1,
           y: 1
         }]),
-        "__tests__/template.marko_0_x_y",
-        1
+        "__tests__/template.marko_0_x_y 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/resume.expected.md
index 9abc61d92..db1ba3469 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/resume.expected.md
@@ -11,8 +11,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -34,8 +33,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/ssr.expected.md
index db64f1737..124466dee 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>&zwj;<!--M_*1 #text/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <div>&zwj;<!--M_*1 #text/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -16,8 +16,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-without-assignments/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-without-assignments/__snapshots__/resume.expected.md
index 1fef31793..41874e130 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-without-assignments/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-without-assignments/__snapshots__/resume.expected.md
@@ -15,8 +15,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-without-assignments/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-without-assignments/__snapshots__/ssr.expected.md
index 5f8661157..10865f441 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-without-assignments/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-without-assignments/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <ul><li>0</li></ul><!--M_*1 #ul/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <ul><li>0</li></ul><!--M_*1 #ul/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -18,8 +18,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/resume.expected.md
index 5d10fd3fd..fbd33ab8e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/resume.expected.md
@@ -26,8 +26,7 @@
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -67,8 +66,7 @@ container.querySelector("#increment")?.click();
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -113,8 +111,7 @@ container.querySelector("#increment")?.click();
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -155,8 +152,7 @@ UPDATE html/body/div/span/#text "1" => "2"
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/ssr.expected.md
index a0c75cbbe..335f8e2b6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>x=<span>0<!--M_*1 #text/0--></span>, was=<!>&zwj;<!--M_*1 #text/1--></div><button id=increment>Increment</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:0}]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <div>x=<span>0<!--M_*1 #text/0--></span>, was=<!>&zwj;<!--M_*1 #text/1--></div><button id=increment>Increment</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:0}]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -31,8 +31,7 @@
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this-attrs/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this-attrs/__snapshots__/resume.expected.md
index 61d918e13..097505260 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this-attrs/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this-attrs/__snapshots__/resume.expected.md
@@ -11,8 +11,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -34,8 +33,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this-attrs/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this-attrs/__snapshots__/ssr.expected.md
index e8c3aa691..0bc1acd66 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this-attrs/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this-attrs/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>0<!--M_*1 #text/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <div>0<!--M_*1 #text/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -16,8 +16,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/resume.expected.md
index 4b5d262a0..6f5c46b6f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/resume.expected.md
@@ -20,8 +20,7 @@
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -59,8 +58,7 @@ container.querySelector("#increment")?.click();
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -99,8 +97,7 @@ container.querySelector("#increment")?.click();
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/ssr.expected.md
index e77e2fc69..75278d3ac 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div id=ref></div><button id=increment>Increment</button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:0}]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <div id=ref></div><button id=increment>Increment</button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:0}]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -23,8 +23,7 @@
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/resume.expected.md
index 48a1e9df6..9bbaacc8d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/resume.expected.md
@@ -20,8 +20,7 @@
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -59,8 +58,7 @@ container.querySelector("#increment")?.click();
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
@@ -99,8 +97,7 @@ container.querySelector("#increment")?.click();
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/ssr.expected.md
index e77e2fc69..75278d3ac 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div id=ref></div><button id=increment>Increment</button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:0}]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <div id=ref></div><button id=increment>Increment</button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:0}]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -23,8 +23,7 @@
         {
           x: 0
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/local-closure-script/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/local-closure-script/__snapshots__/resume.expected.md
index b01a18df4..803b523bf 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/local-closure-script/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/local-closure-script/__snapshots__/resume.expected.md
@@ -28,8 +28,7 @@
         {
           item: 3
         }]),
-        "__tests__/template.marko_1_item",
-        4, 6, 8
+        "__tests__/template.marko_1_item 4 6 8"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/local-closure-script/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/local-closure-script/__snapshots__/ssr.expected.md
index f9c7b413a..c7f8f1938 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/local-closure-script/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/local-closure-script/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*4 #div/0--><div></div><!--M_*6 #div/0--><div></div><!--M_*8 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{},2,{item:1},1,{item:2},1,{item:3}]),"__tests__/template.marko_1_item",4,6,8];M._.w()</script>
+  <div></div><!--M_*4 #div/0--><div></div><!--M_*6 #div/0--><div></div><!--M_*8 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{},2,{item:1},1,{item:2},1,{item:3}]),"__tests__/template.marko_1_item 4 6 8"];M._.w()</script>
 ```
 
 # Render End
@@ -27,8 +27,7 @@
         {
           item: 3
         }]),
-        "__tests__/template.marko_1_item",
-        4, 6, 8
+        "__tests__/template.marko_1_item 4 6 8"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/log-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/log-tag/__snapshots__/resume.expected.md
index 0c0c91bfb..a11772218 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/log-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/log-tag/__snapshots__/resume.expected.md
@@ -10,8 +10,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -32,8 +31,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/log-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/log-tag/__snapshots__/ssr.expected.md
index e5a886a61..1206460e4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/log-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/log-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!>{"identifier":true,"tag var":true,"static var":true}<!--M_*1 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <!>{"identifier":true,"tag var":true,"static var":true}<!--M_*1 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -15,8 +15,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/merged-define-tag-templates/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/merged-define-tag-templates/__snapshots__/resume.expected.md
index f166396df..863e9d03c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/merged-define-tag-templates/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/merged-define-tag-templates/__snapshots__/resume.expected.md
@@ -13,8 +13,7 @@
             "#childScope/0": _.b = {}
           }
         }, _.a, _.b]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -38,8 +37,7 @@
             "#childScope/0": _.b = {}
           }
         }, _.a, _.b]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/merged-define-tag-templates/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/merged-define-tag-templates/__snapshots__/ssr.expected.md
index e16ea03a6..ce1876c59 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/merged-define-tag-templates/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/merged-define-tag-templates/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  0<!--M_*3 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,{"#childScope/0":_.a={"#childScope/0":_.b={}}},_.a,_.b]),"__tests__/template.marko_0",1];M._.w()</script>
+  0<!--M_*3 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,{"#childScope/0":_.a={"#childScope/0":_.b={}}},_.a,_.b]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -18,8 +18,7 @@
             "#childScope/0": _.b = {}
           }
         }, _.a, _.b]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/migrate-effect-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/migrate-effect-tag/__snapshots__/resume.expected.md
index e57cc7641..2171550c2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/migrate-effect-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/migrate-effect-tag/__snapshots__/resume.expected.md
@@ -11,8 +11,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -34,8 +33,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/migrate-effect-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/migrate-effect-tag/__snapshots__/ssr.expected.md
index 5d988c7d3..2609be12e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/migrate-effect-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/migrate-effect-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>1<!--M_*1 #text/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <div>1<!--M_*1 #text/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -16,8 +16,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/multiple-binds/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/multiple-binds/__snapshots__/resume.expected.md
index 84d17b460..2b0b5551f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/multiple-binds/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/multiple-binds/__snapshots__/resume.expected.md
@@ -24,10 +24,7 @@
           "ControlledHandler:#input/2"] = _.a.$valueChange = _._[
           "__tests__/template.marko_0/valueChange2"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -65,10 +62,7 @@ container.querySelector("button").click();
           "ControlledHandler:#input/2"] = _.a.$valueChange = _._[
           "__tests__/template.marko_0/valueChange2"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -106,10 +100,7 @@ container.querySelector("button").click();
           "ControlledHandler:#input/2"] = _.a.$valueChange = _._[
           "__tests__/template.marko_0/valueChange2"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/multiple-binds/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/multiple-binds/__snapshots__/ssr.expected.md
index 6abcc9daa..add8cc7ad 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/multiple-binds/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/multiple-binds/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button><input value=0><!--M_*1 #input/1--><input value=0><!--M_*1 #input/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#input/1":2,"ControlledType:#input/2":2,count:0}],_.a["ControlledHandler:#input/1"]=_.a["ControlledHandler:#input/2"]=_.a.$valueChange=_._["__tests__/template.marko_0/valueChange2"](_.a),_.b),"__tests__/template.marko_0",1,"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button><input value=0><!--M_*1 #input/1--><input value=0><!--M_*1 #input/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#input/1":2,"ControlledType:#input/2":2,count:0}],_.a["ControlledHandler:#input/1"]=_.a["ControlledHandler:#input/2"]=_.a.$valueChange=_._["__tests__/template.marko_0/valueChange2"](_.a),_.b),"__tests__/template.marko_0 1 __tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -29,10 +29,7 @@
           "ControlledHandler:#input/2"] = _.a.$valueChange = _._[
           "__tests__/template.marko_0/valueChange2"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/resume.expected.md
index eac2fb3d7..058ea92f7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/resume.expected.md
@@ -35,10 +35,7 @@
           _._[
             "__tests__/template.marko_0/count2Change"
             ](_.c), _.b),
-        "__tests__/tags/2counters.marko_0_count2",
-        2,
-        "__tests__/tags/2counters.marko_0_count1",
-        2
+        "__tests__/tags/2counters.marko_0_count2 2 __tests__/tags/2counters.marko_0_count1 2"
       ];
       M._.w()
     </script>
@@ -87,10 +84,7 @@ container.querySelectorAll("button").forEach(item => item.click());
           _._[
             "__tests__/template.marko_0/count2Change"
             ](_.c), _.b),
-        "__tests__/tags/2counters.marko_0_count2",
-        2,
-        "__tests__/tags/2counters.marko_0_count1",
-        2
+        "__tests__/tags/2counters.marko_0_count2 2 __tests__/tags/2counters.marko_0_count1 2"
       ];
       M._.w()
     </script>
@@ -146,10 +140,7 @@ container.querySelectorAll("button").forEach(item => item.click());
           _._[
             "__tests__/template.marko_0/count2Change"
             ](_.c), _.b),
-        "__tests__/tags/2counters.marko_0_count2",
-        2,
-        "__tests__/tags/2counters.marko_0_count1",
-        2
+        "__tests__/tags/2counters.marko_0_count2 2 __tests__/tags/2counters.marko_0_count1 2"
       ];
       M._.w()
     </script>
@@ -205,10 +196,7 @@ container.querySelectorAll("button").forEach(item => item.click());
           _._[
             "__tests__/template.marko_0/count2Change"
             ](_.c), _.b),
-        "__tests__/tags/2counters.marko_0_count2",
-        2,
-        "__tests__/tags/2counters.marko_0_count1",
-        2
+        "__tests__/tags/2counters.marko_0_count2 2 __tests__/tags/2counters.marko_0_count1 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/ssr.expected.md
index 217a1269a..59f1e5849 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><button>0<!--M_*2 #text/3--></button><!--M_*2 #button/2--><div>0<!--M_*1 #text/1--> <!>0<!--M_*1 #text/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"#childScope/0":_.a={count1:0,count2:0}},_.a],_.a.input_count1Change=_.a["TagVariableChange:count1"]=_._["__tests__/template.marko_0/count1Change"](_.c),_.a.input_count2Change=_.a["TagVariableChange:count2"]=_._["__tests__/template.marko_0/count2Change"](_.c),_.b),"__tests__/tags/2counters.marko_0_count2",2,"__tests__/tags/2counters.marko_0_count1",2];M._.w()</script>
+  <button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><button>0<!--M_*2 #text/3--></button><!--M_*2 #button/2--><div>0<!--M_*1 #text/1--> <!>0<!--M_*1 #text/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"#childScope/0":_.a={count1:0,count2:0}},_.a],_.a.input_count1Change=_.a["TagVariableChange:count1"]=_._["__tests__/template.marko_0/count1Change"](_.c),_.a.input_count2Change=_.a["TagVariableChange:count2"]=_._["__tests__/template.marko_0/count2Change"](_.c),_.b),"__tests__/tags/2counters.marko_0_count2 2 __tests__/tags/2counters.marko_0_count1 2"];M._.w()</script>
 ```
 
 # Render End
@@ -40,10 +40,7 @@
           _._[
             "__tests__/template.marko_0/count2Change"
             ](_.c), _.b),
-        "__tests__/tags/2counters.marko_0_count2",
-        2,
-        "__tests__/tags/2counters.marko_0_count1",
-        2
+        "__tests__/tags/2counters.marko_0_count2 2 __tests__/tags/2counters.marko_0_count1 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/resume.expected.md
index b222826bb..c9ed56b37 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/resume.expected.md
@@ -79,12 +79,7 @@
         }, _.d = {
           _: _.a
         }], (_.c = new Set).add(_.d), _.b),
-        "__tests__/template.marko_0_Parent_Child",
-        1,
-        "__tests__/template.marko_0_Child",
-        1,
-        "__tests__/template.marko_0_Parent",
-        1
+        "__tests__/template.marko_0_Parent_Child 1 __tests__/template.marko_0_Child 1 __tests__/template.marko_0_Parent 1"
       ];
       M._.w()
     </script>
@@ -185,12 +180,7 @@ container.querySelector(".toggle-parent").click();
         }, _.d = {
           _: _.a
         }], (_.c = new Set).add(_.d), _.b),
-        "__tests__/template.marko_0_Parent_Child",
-        1,
-        "__tests__/template.marko_0_Child",
-        1,
-        "__tests__/template.marko_0_Parent",
-        1
+        "__tests__/template.marko_0_Parent_Child 1 __tests__/template.marko_0_Child 1 __tests__/template.marko_0_Parent 1"
       ];
       M._.w()
     </script>
@@ -289,12 +279,7 @@ container.querySelector(".toggle-parent").click();
         }, _.d = {
           _: _.a
         }], (_.c = new Set).add(_.d), _.b),
-        "__tests__/template.marko_0_Parent_Child",
-        1,
-        "__tests__/template.marko_0_Child",
-        1,
-        "__tests__/template.marko_0_Parent",
-        1
+        "__tests__/template.marko_0_Parent_Child 1 __tests__/template.marko_0_Child 1 __tests__/template.marko_0_Parent 1"
       ];
       M._.w()
     </script>
@@ -393,12 +378,7 @@ container.querySelector(".toggle-parent").click();
         }, _.d = {
           _: _.a
         }], (_.c = new Set).add(_.d), _.b),
-        "__tests__/template.marko_0_Parent_Child",
-        1,
-        "__tests__/template.marko_0_Child",
-        1,
-        "__tests__/template.marko_0_Parent",
-        1
+        "__tests__/template.marko_0_Parent_Child 1 __tests__/template.marko_0_Child 1 __tests__/template.marko_0_Parent 1"
       ];
       M._.w()
     </script>
@@ -483,12 +463,7 @@ container.querySelector(".toggle-child").click();
         }, _.d = {
           _: _.a
         }], (_.c = new Set).add(_.d), _.b),
-        "__tests__/template.marko_0_Parent_Child",
-        1,
-        "__tests__/template.marko_0_Child",
-        1,
-        "__tests__/template.marko_0_Parent",
-        1
+        "__tests__/template.marko_0_Parent_Child 1 __tests__/template.marko_0_Child 1 __tests__/template.marko_0_Parent 1"
       ];
       M._.w()
     </script>
@@ -581,12 +556,7 @@ container.querySelector(".toggle-child").click();
         }, _.d = {
           _: _.a
         }], (_.c = new Set).add(_.d), _.b),
-        "__tests__/template.marko_0_Parent_Child",
-        1,
-        "__tests__/template.marko_0_Child",
-        1,
-        "__tests__/template.marko_0_Parent",
-        1
+        "__tests__/template.marko_0_Parent_Child 1 __tests__/template.marko_0_Child 1 __tests__/template.marko_0_Parent 1"
       ];
       M._.w()
     </script>
@@ -675,12 +645,7 @@ container.querySelector(".toggle-child").click();
         }, _.d = {
           _: _.a
         }], (_.c = new Set).add(_.d), _.b),
-        "__tests__/template.marko_0_Parent_Child",
-        1,
-        "__tests__/template.marko_0_Child",
-        1,
-        "__tests__/template.marko_0_Parent",
-        1
+        "__tests__/template.marko_0_Parent_Child 1 __tests__/template.marko_0_Child 1 __tests__/template.marko_0_Parent 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/ssr.expected.md
index bd4d6f161..b551bd964 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><svg><a href=#></a><a href=#bar><!--M_[-->Hi<!--M_]2 #a/0 3--></a><!--M_'1 #text/2 2--></svg><math><a href=#></a><a href=#bar><!--M_[-->Hi<!--M_]4 #a/0 5--></a><!--M_'1 #text/4 4--></math><div><!--M_[--><a href=#></a><!--M_]6 #div/0 7--></div><!--M_'1 #text/5 6--><button class=toggle-parent>Toggle Parent</button><!--M_*1 #button/6--><button class=toggle-child>Toggle Child</button><!--M_*1 #button/7--></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ConditionalRenderer:#text/2":"a","ConditionalRenderer:#text/4":"a","ConditionalRenderer:#text/5":"div",input_value:"\x3Ca href=#>\x3C/a>",Parent:"div",Child:"a"},{"ConditionalRenderer:#a/0":"__tests__/template.marko_2_content"},1,{"ConditionalRenderer:#a/0":"__tests__/template.marko_3_content"},1,{"ConditionalRenderer:#div/0":"__tests__/template.marko_1_content"},_.d={_:_.a}],(_.c=new Set).add(_.d),_.b),"__tests__/template.marko_0_Parent_Child",1,"__tests__/template.marko_0_Child",1,"__tests__/template.marko_0_Parent",1];M._.w()</script>
+  <div><svg><a href=#></a><a href=#bar><!--M_[-->Hi<!--M_]2 #a/0 3--></a><!--M_'1 #text/2 2--></svg><math><a href=#></a><a href=#bar><!--M_[-->Hi<!--M_]4 #a/0 5--></a><!--M_'1 #text/4 4--></math><div><!--M_[--><a href=#></a><!--M_]6 #div/0 7--></div><!--M_'1 #text/5 6--><button class=toggle-parent>Toggle Parent</button><!--M_*1 #button/6--><button class=toggle-child>Toggle Child</button><!--M_*1 #button/7--></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ConditionalRenderer:#text/2":"a","ConditionalRenderer:#text/4":"a","ConditionalRenderer:#text/5":"div",input_value:"\x3Ca href=#>\x3C/a>",Parent:"div",Child:"a"},{"ConditionalRenderer:#a/0":"__tests__/template.marko_2_content"},1,{"ConditionalRenderer:#a/0":"__tests__/template.marko_3_content"},1,{"ConditionalRenderer:#div/0":"__tests__/template.marko_1_content"},_.d={_:_.a}],(_.c=new Set).add(_.d),_.b),"__tests__/template.marko_0_Parent_Child 1 __tests__/template.marko_0_Child 1 __tests__/template.marko_0_Parent 1"];M._.w()</script>
 ```
 
 # Render End
@@ -78,12 +78,7 @@
         }, _.d = {
           _: _.a
         }], (_.c = new Set).add(_.d), _.b),
-        "__tests__/template.marko_0_Parent_Child",
-        1,
-        "__tests__/template.marko_0_Child",
-        1,
-        "__tests__/template.marko_0_Parent",
-        1
+        "__tests__/template.marko_0_Parent_Child 1 __tests__/template.marko_0_Child 1 __tests__/template.marko_0_Parent 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-downstream-effect/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-downstream-effect/__snapshots__/resume.expected.md
index 69582ef17..74ea2001c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-downstream-effect/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-downstream-effect/__snapshots__/resume.expected.md
@@ -13,8 +13,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2
+        "__tests__/template.marko_1 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-downstream-effect/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-downstream-effect/__snapshots__/ssr.expected.md
index cf588de8e..4889a0481 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-downstream-effect/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-downstream-effect/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={},{_:_.a}]),"__tests__/template.marko_1",2];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={},{_:_.a}]),"__tests__/template.marko_1 2"];M._.w()</script>
 ```
 
 # Render End
@@ -16,8 +16,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_1",
-        2
+        "__tests__/template.marko_1 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/resume.expected.md
index a516eae3e..482608c13 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/resume.expected.md
@@ -12,8 +12,7 @@
       M._.r = [_ =&gt; (_.b = [0, _.c = {}, _.a = {}], _.a.el = _._[
           "__tests__/template.marko_0/#div"
           ](_.c), _.b),
-        "__tests__/tags/hello-setter.marko_0_el",
-        2
+        "__tests__/tags/hello-setter.marko_0_el 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/ssr.expected.md
index 3273b71d5..9f4ba15a8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={},_.a={}],_.a.el=_._["__tests__/template.marko_0/#div"](_.c),_.b),"__tests__/tags/hello-setter.marko_0_el",2];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={},_.a={}],_.a.el=_._["__tests__/template.marko_0/#div"](_.c),_.b),"__tests__/tags/hello-setter.marko_0_el 2"];M._.w()</script>
 ```
 
 # Render End
@@ -15,8 +15,7 @@
       M._.r = [_ =&gt; (_.b = [0, _.c = {}, _.a = {}], _.a.el = _._[
           "__tests__/template.marko_0/#div"
           ](_.c), _.b),
-        "__tests__/tags/hello-setter.marko_0_el",
-        2
+        "__tests__/tags/hello-setter.marko_0_el 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/resume.expected.md
index c0f882420..48760ec5d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/resume.expected.md
@@ -11,8 +11,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/ssr.expected.md
index 101fa1d2a..cc2c7426b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -14,8 +14,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-spread-content/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/native-tag-spread-content/__snapshots__/resume.expected.md
index a7d8d90ab..94ea2f16e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-spread-content/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-spread-content/__snapshots__/resume.expected.md
@@ -49,10 +49,7 @@
           ](_.h), _.b.CustomContent_content = _._[
           "__tests__/tags/my-div.marko_1_content"
           ](_.b), _.g),
-        "__tests__/tags/my-div.marko_0_input_CustomContent_content",
-        2,
-        "__tests__/tags/my-div.marko_0_input",
-        2
+        "__tests__/tags/my-div.marko_0_input_CustomContent_content 2 __tests__/tags/my-div.marko_0_input 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-spread-content/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/native-tag-spread-content/__snapshots__/ssr.expected.md
index 885e2c571..d06517f3d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-spread-content/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-spread-content/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>Hello</div><!--M_*2 #div/0--><button foo=1>Hello</button><!--M_*2 #button/1--><span>Overridden</span><!--M_*2 #span/2--><output></output><!--M_*2 #output/3--><strong>Custom content</strong><!--M_*2 #strong/4--><p>Hello</p><!--M_*2 #p/5--><em>Custom content</em><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.g=[0,1,_.b={"BranchScopes:#div/0":_.c={},"ConditionalRenderer:#div/0":"__tests__/template.marko_1_content","BranchScopes:#button/1":_.d={},"ConditionalRenderer:#button/1":"__tests__/template.marko_1_content","BranchScopes:#strong/4":_.e={},"ConditionalRenderer:#strong/4":"__tests__/tags/my-div.marko_1_content","BranchScopes:#p/5":_.f={},"ConditionalRenderer:#p/5":"__tests__/template.marko_1_content",input:_.a={content:_.h={}}},_.c,_.d,1,_.e,_.f],_.a.content=_._["__tests__/template.marko_1_content"](_.h),_.b.CustomContent_content=_._["__tests__/tags/my-div.marko_1_content"](_.b),_.g),"__tests__/tags/my-div.marko_0_input_CustomContent_content",2,"__tests__/tags/my-div.marko_0_input",2];M._.w()</script>
+  <div>Hello</div><!--M_*2 #div/0--><button foo=1>Hello</button><!--M_*2 #button/1--><span>Overridden</span><!--M_*2 #span/2--><output></output><!--M_*2 #output/3--><strong>Custom content</strong><!--M_*2 #strong/4--><p>Hello</p><!--M_*2 #p/5--><em>Custom content</em><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.g=[0,1,_.b={"BranchScopes:#div/0":_.c={},"ConditionalRenderer:#div/0":"__tests__/template.marko_1_content","BranchScopes:#button/1":_.d={},"ConditionalRenderer:#button/1":"__tests__/template.marko_1_content","BranchScopes:#strong/4":_.e={},"ConditionalRenderer:#strong/4":"__tests__/tags/my-div.marko_1_content","BranchScopes:#p/5":_.f={},"ConditionalRenderer:#p/5":"__tests__/template.marko_1_content",input:_.a={content:_.h={}}},_.c,_.d,1,_.e,_.f],_.a.content=_._["__tests__/template.marko_1_content"](_.h),_.b.CustomContent_content=_._["__tests__/tags/my-div.marko_1_content"](_.b),_.g),"__tests__/tags/my-div.marko_0_input_CustomContent_content 2 __tests__/tags/my-div.marko_0_input 2"];M._.w()</script>
 ```
 
 # Render End
@@ -54,10 +54,7 @@
           ](_.h), _.b.CustomContent_content = _._[
           "__tests__/tags/my-div.marko_1_content"
           ](_.b), _.g),
-        "__tests__/tags/my-div.marko_0_input_CustomContent_content",
-        2,
-        "__tests__/tags/my-div.marko_0_input",
-        2
+        "__tests__/tags/my-div.marko_0_input_CustomContent_content 2 __tests__/tags/my-div.marko_0_input 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/resume.expected.md
index e550fdd47..8e04705bc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/resume.expected.md
@@ -24,8 +24,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -63,8 +62,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -106,8 +104,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -151,8 +148,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/ssr.expected.md
index 882663935..82f6de6ae 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0-->used to be <span>0<!--M_*1 #text/2--></span> which should be the same as <span>0<!--M_*1 #text/3--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{clickCount:0}]),"__tests__/template.marko_0_clickCount",1];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0-->used to be <span>0<!--M_*1 #text/2--></span> which should be the same as <span>0<!--M_*1 #text/3--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{clickCount:0}]),"__tests__/template.marko_0_clickCount 1"];M._.w()</script>
 ```
 
 # Render End
@@ -29,8 +29,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/nested-for-if-stateful/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/nested-for-if-stateful/__snapshots__/resume.expected.md
index 5132daa88..b70310459 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/nested-for-if-stateful/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/nested-for-if-stateful/__snapshots__/resume.expected.md
@@ -63,8 +63,7 @@
         {
           _: _.d
         }]),
-        "__tests__/template.marko_3",
-        3, 5, 7
+        "__tests__/template.marko_3 3 5 7"
       ];
       M._.w()
     </script>
@@ -147,8 +146,7 @@ buttonIndex = (buttonIndex + 1) % 3;
         {
           _: _.d
         }]),
-        "__tests__/template.marko_3",
-        3, 5, 7
+        "__tests__/template.marko_3 3 5 7"
       ];
       M._.w()
     </script>
@@ -226,8 +224,7 @@ buttonIndex = (buttonIndex + 1) % 3;
         {
           _: _.d
         }]),
-        "__tests__/template.marko_3",
-        3, 5, 7
+        "__tests__/template.marko_3 3 5 7"
       ];
       M._.w()
     </script>
@@ -302,8 +299,7 @@ buttonIndex = (buttonIndex + 1) % 3;
         {
           _: _.d
         }]),
-        "__tests__/template.marko_3",
-        3, 5, 7
+        "__tests__/template.marko_3 3 5 7"
       ];
       M._.w()
     </script>
@@ -378,8 +374,7 @@ buttonIndex = (buttonIndex + 1) % 3;
         {
           _: _.d
         }]),
-        "__tests__/template.marko_3",
-        3, 5, 7
+        "__tests__/template.marko_3 3 5 7"
       ];
       M._.w()
     </script>
@@ -454,8 +449,7 @@ buttonIndex = (buttonIndex + 1) % 3;
         {
           _: _.d
         }]),
-        "__tests__/template.marko_3",
-        3, 5, 7
+        "__tests__/template.marko_3 3 5 7"
       ];
       M._.w()
     </script>
@@ -530,8 +524,7 @@ buttonIndex = (buttonIndex + 1) % 3;
         {
           _: _.d
         }]),
-        "__tests__/template.marko_3",
-        3, 5, 7
+        "__tests__/template.marko_3 3 5 7"
       ];
       M._.w()
     </script>
@@ -606,8 +599,7 @@ buttonIndex = (buttonIndex + 1) % 3;
         {
           _: _.d
         }]),
-        "__tests__/template.marko_3",
-        3, 5, 7
+        "__tests__/template.marko_3 3 5 7"
       ];
       M._.w()
     </script>
@@ -682,8 +674,7 @@ buttonIndex = (buttonIndex + 1) % 3;
         {
           _: _.d
         }]),
-        "__tests__/template.marko_3",
-        3, 5, 7
+        "__tests__/template.marko_3 3 5 7"
       ];
       M._.w()
     </script>
@@ -758,8 +749,7 @@ buttonIndex = (buttonIndex + 1) % 3;
         {
           _: _.d
         }]),
-        "__tests__/template.marko_3",
-        3, 5, 7
+        "__tests__/template.marko_3 3 5 7"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/nested-for-if-stateful/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/nested-for-if-stateful/__snapshots__/ssr.expected.md
index 6e5474bd1..efba55f84 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/nested-for-if-stateful/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/nested-for-if-stateful/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[--><button>Increment <!>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><!--M_|2 #text/0 3--><!--M_[2--><button>Increment <!>0<!--M_*5 #text/1--></button><!--M_*5 #button/0--><!--M_|4 #text/0 5--><!--M_[4--><button>Increment <!>0<!--M_*7 #text/1--></button><!--M_*7 #button/0--><!--M_|6 #text/0 7--><!--M_]1 #text/0 6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.e=[0,_.a={counts:[0,0,0],"ClosureScopes:counts":new Set},_.b={"ConditionalRenderer:#text/0":1,count:0,i:0,_:_.a},{_:_.b},_.c={"ConditionalRenderer:#text/0":1,count:0,i:1,_:_.a,"#LoopKey":1},{_:_.c},_.d={"ConditionalRenderer:#text/0":1,count:0,i:2,_:_.a,"#LoopKey":2},{_:_.d}]),"__tests__/template.marko_3",3,5,7];M._.w()</script>
+  <!--M_[--><button>Increment <!>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><!--M_|2 #text/0 3--><!--M_[2--><button>Increment <!>0<!--M_*5 #text/1--></button><!--M_*5 #button/0--><!--M_|4 #text/0 5--><!--M_[4--><button>Increment <!>0<!--M_*7 #text/1--></button><!--M_*7 #button/0--><!--M_|6 #text/0 7--><!--M_]1 #text/0 6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.e=[0,_.a={counts:[0,0,0],"ClosureScopes:counts":new Set},_.b={"ConditionalRenderer:#text/0":1,count:0,i:0,_:_.a},{_:_.b},_.c={"ConditionalRenderer:#text/0":1,count:0,i:1,_:_.a,"#LoopKey":1},{_:_.c},_.d={"ConditionalRenderer:#text/0":1,count:0,i:2,_:_.a,"#LoopKey":2},{_:_.d}]),"__tests__/template.marko_3 3 5 7"];M._.w()</script>
 ```
 
 # Render End
@@ -68,8 +68,7 @@
         {
           _: _.d
         }]),
-        "__tests__/template.marko_3",
-        3, 5, 7
+        "__tests__/template.marko_3 3 5 7"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/no-render-content-conditional/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/no-render-content-conditional/__snapshots__/resume.expected.md
index 6bf4263df..7e242aa2f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/no-render-content-conditional/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/no-render-content-conditional/__snapshots__/resume.expected.md
@@ -20,8 +20,7 @@
         }], _.a.output = _._[
           "__tests__/template.marko_0/#div"
           ](_.c), _.b),
-        "__tests__/tags/child.marko_0_input_x",
-        2
+        "__tests__/tags/child.marko_0_input_x 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/no-render-content-conditional/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/no-render-content-conditional/__snapshots__/ssr.expected.md
index 2103f5822..4e1fd7b43 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/no-render-content-conditional/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/no-render-content-conditional/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={},{"#scopeOffset/1":4,input:_.a={foo:"bar"},x:"bar"}],_.a.output=_._["__tests__/template.marko_0/#div"](_.c),_.b),"__tests__/tags/child.marko_0_input_x",2];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={},{"#scopeOffset/1":4,input:_.a={foo:"bar"},x:"bar"}],_.a.output=_._["__tests__/template.marko_0/#div"](_.c),_.b),"__tests__/tags/child.marko_0_input_x 2"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
         }], _.a.output = _._[
           "__tests__/template.marko_0/#div"
           ](_.c), _.b),
-        "__tests__/tags/child.marko_0_input_x",
-        2
+        "__tests__/tags/child.marko_0_input_x 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/no-render-content-subtree/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/no-render-content-subtree/__snapshots__/resume.expected.md
index 897abdeda..cb80b3c41 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/no-render-content-subtree/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/no-render-content-subtree/__snapshots__/resume.expected.md
@@ -23,8 +23,7 @@
         }], _.b.output = _._[
           "__tests__/template.marko_0/#div"
           ](_.a), _.c),
-        "__tests__/tags/child.marko_0_input_x",
-        3
+        "__tests__/tags/child.marko_0_input_x 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/no-render-content-subtree/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/no-render-content-subtree/__snapshots__/ssr.expected.md
index aba5ca39b..1e18fc348 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/no-render-content-subtree/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/no-render-content-subtree/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={},{_:_.a},{"#scopeOffset/1":5,input:_.b={foo:"bar"},x:"bar"}],_.b.output=_._["__tests__/template.marko_0/#div"](_.a),_.c),"__tests__/tags/child.marko_0_input_x",3];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={},{_:_.a},{"#scopeOffset/1":5,input:_.b={foo:"bar"},x:"bar"}],_.b.output=_._["__tests__/template.marko_0/#div"](_.a),_.c),"__tests__/tags/child.marko_0_input_x 3"];M._.w()</script>
 ```
 
 # Render End
@@ -25,8 +25,7 @@
         }], _.b.output = _._[
           "__tests__/template.marko_0/#div"
           ](_.a), _.c),
-        "__tests__/tags/child.marko_0_input_x",
-        3
+        "__tests__/tags/child.marko_0_input_x 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/param-destructure-dynamic-default/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/param-destructure-dynamic-default/__snapshots__/resume.expected.md
index ede781338..aa6c91e63 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/param-destructure-dynamic-default/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/param-destructure-dynamic-default/__snapshots__/resume.expected.md
@@ -92,8 +92,7 @@
             "ClosureSignalIndex:count": 1
           }], (_.c).add(_.d), _.c.add(_.e), _.c.add(_.f), _.c.add(_.g), _.c
           .add(_.h), _.c.add(_.i), _.b),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -199,8 +198,7 @@ container.querySelector("button")?.click();
             "ClosureSignalIndex:count": 1
           }], (_.c).add(_.d), _.c.add(_.e), _.c.add(_.f), _.c.add(_.g), _.c
           .add(_.h), _.c.add(_.i), _.b),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -313,8 +311,7 @@ container.querySelector("button")?.click();
             "ClosureSignalIndex:count": 1
           }], (_.c).add(_.d), _.c.add(_.e), _.c.add(_.f), _.c.add(_.g), _.c
           .add(_.h), _.c.add(_.i), _.b),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/param-destructure-dynamic-default/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/param-destructure-dynamic-default/__snapshots__/ssr.expected.md
index 83bc188eb..8f8a8e80a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/param-destructure-dynamic-default/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/param-destructure-dynamic-default/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div id=a class=a>0<!--M_*2 #text/1--> object</div><div id=b class=a>1<!--M_*3 #text/1--> object</div><div id=c class=a>2<!--M_*4 #text/1--> undefined</div><div id=d class=b>0<!--M_*5 #text/1--> object</div><div id=e class=b>1<!--M_*6 #text/1--> object</div><div id=f class=b>2<!--M_*7 #text/1--> undefined</div><button>Increment default</button><!--M_*1 #button/6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={count:0,"ClosureScopes:count":_.c=new Set},_.d={foo:{bar:0},_:_.a,"ClosureSignalIndex:count":0},_.e={foo:{},_:_.a,"ClosureSignalIndex:count":0},_.f={_:_.a,"ClosureSignalIndex:count":0},_.g={foo:{bar:0},_:_.a,"ClosureSignalIndex:count":1},_.h={foo:{},_:_.a,"ClosureSignalIndex:count":1},_.i={_:_.a,"ClosureSignalIndex:count":1}],(_.c).add(_.d),_.c.add(_.e),_.c.add(_.f),_.c.add(_.g),_.c.add(_.h),_.c.add(_.i),_.b),"__tests__/template.marko_0_count",1];M._.w()</script>
+  <div id=a class=a>0<!--M_*2 #text/1--> object</div><div id=b class=a>1<!--M_*3 #text/1--> object</div><div id=c class=a>2<!--M_*4 #text/1--> undefined</div><div id=d class=b>0<!--M_*5 #text/1--> object</div><div id=e class=b>1<!--M_*6 #text/1--> object</div><div id=f class=b>2<!--M_*7 #text/1--> undefined</div><button>Increment default</button><!--M_*1 #button/6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={count:0,"ClosureScopes:count":_.c=new Set},_.d={foo:{bar:0},_:_.a,"ClosureSignalIndex:count":0},_.e={foo:{},_:_.a,"ClosureSignalIndex:count":0},_.f={_:_.a,"ClosureSignalIndex:count":0},_.g={foo:{bar:0},_:_.a,"ClosureSignalIndex:count":1},_.h={foo:{},_:_.a,"ClosureSignalIndex:count":1},_.i={_:_.a,"ClosureSignalIndex:count":1}],(_.c).add(_.d),_.c.add(_.e),_.c.add(_.f),_.c.add(_.g),_.c.add(_.h),_.c.add(_.i),_.b),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -97,8 +97,7 @@
             "ClosureSignalIndex:count": 1
           }], (_.c).add(_.d), _.c.add(_.e), _.c.add(_.f), _.c.add(_.g), _.c
           .add(_.h), _.c.add(_.i), _.b),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/placeholder-static-multiple/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/placeholder-static-multiple/__snapshots__/resume.expected.md
index bc321c0d3..56ac4ddc9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/placeholder-static-multiple/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/placeholder-static-multiple/__snapshots__/resume.expected.md
@@ -11,8 +11,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -35,8 +34,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/placeholder-static-multiple/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/placeholder-static-multiple/__snapshots__/ssr.expected.md
index b38d6d0eb..33855c8aa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/placeholder-static-multiple/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/placeholder-static-multiple/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><!--M_[--><!--M_)1 #div/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <div><!--M_[--><!--M_)1 #div/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -16,8 +16,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/read-proposed-tag-variable-after-write/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/read-proposed-tag-variable-after-write/__snapshots__/resume.expected.md
index b44137512..4e59cb9f7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/read-proposed-tag-variable-after-write/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/read-proposed-tag-variable-after-write/__snapshots__/resume.expected.md
@@ -20,8 +20,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -59,8 +58,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -104,8 +102,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -151,8 +148,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/read-proposed-tag-variable-after-write/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/read-proposed-tag-variable-after-write/__snapshots__/ssr.expected.md
index 44e36be8c..ea7ffd469 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/read-proposed-tag-variable-after-write/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/read-proposed-tag-variable-after-write/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><div></div><!--M_*1 #div/2--><div></div><!--M_*1 #div/3--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{clickCount:0}]),"__tests__/template.marko_0_clickCount",1];M._.w()</script>
+  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><div></div><!--M_*1 #div/2--><div></div><!--M_*1 #div/3--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{clickCount:0}]),"__tests__/template.marko_0_clickCount 1"];M._.w()</script>
 ```
 
 # Render End
@@ -25,8 +25,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/resume.expected.md
index 50be4775d..36fab7dff 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/resume.expected.md
@@ -30,8 +30,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -75,8 +74,7 @@ container.querySelector("#addTwo").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -126,8 +124,7 @@ container.querySelector("#triple").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -177,8 +174,7 @@ container.querySelector("#cube").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/ssr.expected.md
index a57a94d63..29452b803 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button id=addTwo>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><button id=triple>0<!--M_*1 #text/3--></button><!--M_*1 #button/2--><button id=cube>0<!--M_*1 #text/5--></button><!--M_*1 #button/4--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button id=addTwo>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><button id=triple>0<!--M_*1 #text/3--></button><!--M_*1 #button/2--><button id=cube>0<!--M_*1 #text/5--></button><!--M_*1 #button/4--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -35,8 +35,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/resume-single-node/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/resume-single-node/__snapshots__/resume.expected.md
index bb426d749..990ed2757 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/resume-single-node/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/resume-single-node/__snapshots__/resume.expected.md
@@ -23,8 +23,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_itemId_items",
-        1
+        "__tests__/template.marko_0_itemId_items 1"
       ];
       M._.w()
     </script>
@@ -76,8 +75,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_itemId_items",
-        1
+        "__tests__/template.marko_0_itemId_items 1"
       ];
       M._.w()
     </script>
@@ -138,8 +136,7 @@ container.querySelector("button").click();
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_itemId_items",
-        1
+        "__tests__/template.marko_0_itemId_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/resume-single-node/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/resume-single-node/__snapshots__/ssr.expected.md
index 010e0c2bb..db839e62d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/resume-single-node/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/resume-single-node/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[--><div>a</div><!--M_|2 #text/0--><!--M_]1 #text/0 2--><button>More</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={itemId:0,items:[0],items_length:1},{_:_.a}]),"__tests__/template.marko_0_itemId_items",1];M._.w()</script>
+  <!--M_[--><div>a</div><!--M_|2 #text/0--><!--M_]1 #text/0 2--><button>More</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={itemId:0,items:[0],items_length:1},{_:_.a}]),"__tests__/template.marko_0_itemId_items 1"];M._.w()</script>
 ```
 
 # Render End
@@ -28,8 +28,7 @@
         {
           _: _.a
         }]),
-        "__tests__/template.marko_0_itemId_items",
-        1
+        "__tests__/template.marko_0_itemId_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/return-serialize-circular/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/return-serialize-circular/__snapshots__/resume.expected.md
index 767101bfe..412fdf7dd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/return-serialize-circular/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/return-serialize-circular/__snapshots__/resume.expected.md
@@ -20,8 +20,7 @@
           ](_.b), _.b["#TagVariable"] = _._[
           "__tests__/template.marko_0_setCount/var"
           ](_.a), _.c),
-        "__tests__/template.marko_0_setCount",
-        1
+        "__tests__/template.marko_0_setCount 1"
       ];
       M._.w()
     </script>
@@ -52,8 +51,7 @@
           ](_.b), _.b["#TagVariable"] = _._[
           "__tests__/template.marko_0_setCount/var"
           ](_.a), _.c),
-        "__tests__/template.marko_0_setCount",
-        1
+        "__tests__/template.marko_0_setCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/return-serialize-circular/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/return-serialize-circular/__snapshots__/ssr.expected.md
index 59fee36ef..42189906f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/return-serialize-circular/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/return-serialize-circular/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>0<!--M_*1 #text/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"#scopeOffset/1":3,setCount:_.b={},"#childScope/0":_.b},_.b],_.b.input_valueChange=_._["__tests__/template.marko_0/valueChange"](_.a),_.a.setCount=_.b.setter=_._["__tests__/tags/setter.marko_0/setter"](_.b),_.b["#TagVariable"]=_._["__tests__/template.marko_0_setCount/var"](_.a),_.c),"__tests__/template.marko_0_setCount",1];M._.w()</script>
+  <div>0<!--M_*1 #text/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={"#scopeOffset/1":3,setCount:_.b={},"#childScope/0":_.b},_.b],_.b.input_valueChange=_._["__tests__/template.marko_0/valueChange"](_.a),_.a.setCount=_.b.setter=_._["__tests__/tags/setter.marko_0/setter"](_.b),_.b["#TagVariable"]=_._["__tests__/template.marko_0_setCount/var"](_.a),_.c),"__tests__/template.marko_0_setCount 1"];M._.w()</script>
 ```
 
 # Render End
@@ -25,8 +25,7 @@
           ](_.b), _.b["#TagVariable"] = _._[
           "__tests__/template.marko_0_setCount/var"
           ](_.a), _.c),
-        "__tests__/template.marko_0_setCount",
-        1
+        "__tests__/template.marko_0_setCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/return-value-registered/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/return-value-registered/__snapshots__/resume.expected.md
index 28e5a9fc3..c99b8f712 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/return-value-registered/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/return-value-registered/__snapshots__/resume.expected.md
@@ -15,8 +15,7 @@
             "__tests__/tags/getter.marko_0/getter"
             ]
         }]),
-        "__tests__/template.marko_0_get",
-        1
+        "__tests__/template.marko_0_get 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/return-value-registered/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/return-value-registered/__snapshots__/ssr.expected.md
index 5920baf69..92ed6f624 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/return-value-registered/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/return-value-registered/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{get:_._["__tests__/tags/getter.marko_0/getter"]}]),"__tests__/template.marko_0_get",1];M._.w()</script>
+  <div></div><!--M_*1 #div/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{get:_._["__tests__/tags/getter.marko_0/getter"]}]),"__tests__/template.marko_0_get 1"];M._.w()</script>
 ```
 
 # Render End
@@ -18,8 +18,7 @@
             "__tests__/tags/getter.marko_0/getter"
             ]
         }]),
-        "__tests__/template.marko_0_get",
-        1
+        "__tests__/template.marko_0_get 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/resume.expected.md
index 387d0b564..2863c6726 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/resume.expected.md
@@ -45,10 +45,7 @@
           ](_.c), _.c["#TagVariable"] = _._[
           "__tests__/template.marko_0_onClickTwice/var"
           ](_.a), _.d),
-        "__tests__/template.marko_0_onClickTwice",
-        1,
-        "__tests__/template.marko_0_onClickOnce",
-        1
+        "__tests__/template.marko_0_onClickTwice 1 __tests__/template.marko_0_onClickOnce 1"
       ];
       M._.w()
     </script>
@@ -107,10 +104,7 @@ container.querySelector("button.once").click();
           ](_.c), _.c["#TagVariable"] = _._[
           "__tests__/template.marko_0_onClickTwice/var"
           ](_.a), _.d),
-        "__tests__/template.marko_0_onClickTwice",
-        1,
-        "__tests__/template.marko_0_onClickOnce",
-        1
+        "__tests__/template.marko_0_onClickTwice 1 __tests__/template.marko_0_onClickOnce 1"
       ];
       M._.w()
     </script>
@@ -173,10 +167,7 @@ container.querySelector("button.once").click();
           ](_.c), _.c["#TagVariable"] = _._[
           "__tests__/template.marko_0_onClickTwice/var"
           ](_.a), _.d),
-        "__tests__/template.marko_0_onClickTwice",
-        1,
-        "__tests__/template.marko_0_onClickOnce",
-        1
+        "__tests__/template.marko_0_onClickTwice 1 __tests__/template.marko_0_onClickOnce 1"
       ];
       M._.w()
     </script>
@@ -235,10 +226,7 @@ container.querySelector("button.twice").click();
           ](_.c), _.c["#TagVariable"] = _._[
           "__tests__/template.marko_0_onClickTwice/var"
           ](_.a), _.d),
-        "__tests__/template.marko_0_onClickTwice",
-        1,
-        "__tests__/template.marko_0_onClickOnce",
-        1
+        "__tests__/template.marko_0_onClickTwice 1 __tests__/template.marko_0_onClickOnce 1"
       ];
       M._.w()
     </script>
@@ -301,10 +289,7 @@ container.querySelector("button.twice").click();
           ](_.c), _.c["#TagVariable"] = _._[
           "__tests__/template.marko_0_onClickTwice/var"
           ](_.a), _.d),
-        "__tests__/template.marko_0_onClickTwice",
-        1,
-        "__tests__/template.marko_0_onClickOnce",
-        1
+        "__tests__/template.marko_0_onClickTwice 1 __tests__/template.marko_0_onClickOnce 1"
       ];
       M._.w()
     </script>
@@ -367,10 +352,7 @@ container.querySelector("button.twice").click();
           ](_.c), _.c["#TagVariable"] = _._[
           "__tests__/template.marko_0_onClickTwice/var"
           ](_.a), _.d),
-        "__tests__/template.marko_0_onClickTwice",
-        1,
-        "__tests__/template.marko_0_onClickOnce",
-        1
+        "__tests__/template.marko_0_onClickTwice 1 __tests__/template.marko_0_onClickOnce 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/ssr.expected.md
index 784042eef..2b3d22c1b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=once>0<!--M_*1 #text/3--></button><!--M_*1 #button/2--><button class=twice>0<!--M_*1 #text/7--></button><!--M_*1 #button/6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,clickOnceCount:0,onClickOnce:_.b={call:1},clickTwiceCount:0,onClickTwice:_.c={call:2},"#childScope/0":_.b,"#childScope/4":_.c},_.b,1,_.c],_.b.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.b),_.b["#TagVariable"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return2"](_.c),_.c["#TagVariable"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.d),"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",1];M._.w()</script>
+  <button class=once>0<!--M_*1 #text/3--></button><!--M_*1 #button/2--><button class=twice>0<!--M_*1 #text/7--></button><!--M_*1 #button/6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d=[0,_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,clickOnceCount:0,onClickOnce:_.b={call:1},clickTwiceCount:0,onClickTwice:_.c={call:2},"#childScope/0":_.b,"#childScope/4":_.c},_.b,1,_.c],_.b.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.b),_.b["#TagVariable"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return2"](_.c),_.c["#TagVariable"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.d),"__tests__/template.marko_0_onClickTwice 1 __tests__/template.marko_0_onClickOnce 1"];M._.w()</script>
 ```
 
 # Render End
@@ -50,10 +50,7 @@
           ](_.c), _.c["#TagVariable"] = _._[
           "__tests__/template.marko_0_onClickTwice/var"
           ](_.a), _.d),
-        "__tests__/template.marko_0_onClickTwice",
-        1,
-        "__tests__/template.marko_0_onClickOnce",
-        1
+        "__tests__/template.marko_0_onClickTwice 1 __tests__/template.marko_0_onClickOnce 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/resume.expected.md
index 1d7ebd5d3..50bc2f491 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/resume.expected.md
@@ -18,8 +18,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -51,8 +50,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -89,8 +87,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/ssr.expected.md
index 3ff901911..9032b89c5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>0<!--M_*1 #text/1--> <!>0<!--M_*1 #text/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button>0<!--M_*1 #text/1--> <!>0<!--M_*1 #text/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -23,8 +23,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/script-no-references/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/script-no-references/__snapshots__/resume.expected.md
index 950f2ba39..8369ac3d3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/script-no-references/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/script-no-references/__snapshots__/resume.expected.md
@@ -11,8 +11,7 @@
     <script>
       WALKER_RUNTIME("M")("_");
       M._.r = [
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/script-no-references/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/script-no-references/__snapshots__/ssr.expected.md
index 49bcb5deb..55e13e698 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/script-no-references/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/script-no-references/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div id=foo></div><script>WALKER_RUNTIME("M")("_");M._.r=["__tests__/template.marko_0",1];M._.w()</script>
+  <div id=foo></div><script>WALKER_RUNTIME("M")("_");M._.r=["__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -14,8 +14,7 @@
     <script>
       WALKER_RUNTIME("M")("_");
       M._.r = [
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/script-tag-value-no-scope/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/script-tag-value-no-scope/__snapshots__/resume.expected.md
index 999f3bfbe..6f53de13c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/script-tag-value-no-scope/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/script-tag-value-no-scope/__snapshots__/resume.expected.md
@@ -12,8 +12,7 @@
       M._.r = [_ =&gt; (_.b = [0, _.a = {}], _.a.setText = _._[
           "__tests__/template.marko_0/setText"
           ](_.a), _.b),
-        "__tests__/template.marko_0_setText",
-        1
+        "__tests__/template.marko_0_setText 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/script-tag-value-no-scope/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/script-tag-value-no-scope/__snapshots__/ssr.expected.md
index c1d078633..d4c0c546c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/script-tag-value-no-scope/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/script-tag-value-no-scope/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={}],_.a.setText=_._["__tests__/template.marko_0/setText"](_.a),_.b),"__tests__/template.marko_0_setText",1];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={}],_.a.setText=_._["__tests__/template.marko_0/setText"](_.a),_.b),"__tests__/template.marko_0_setText 1"];M._.w()</script>
 ```
 
 # Render End
@@ -15,8 +15,7 @@
       M._.r = [_ =&gt; (_.b = [0, _.a = {}], _.a.setText = _._[
           "__tests__/template.marko_0/setText"
           ](_.a), _.b),
-        "__tests__/template.marko_0_setText",
-        1
+        "__tests__/template.marko_0_setText 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/script-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/script-tag/__snapshots__/resume.expected.md
index 76eac6089..8ec87aa13 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/script-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/script-tag/__snapshots__/resume.expected.md
@@ -14,8 +14,7 @@
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/script-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/script-tag/__snapshots__/ssr.expected.md
index 58fc181bc..728dc9cc7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/script-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/script-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div id=ref>0</div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:1}]),"__tests__/template.marko_0_x",1];M._.w()</script>
+  <div id=ref>0</div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{x:1}]),"__tests__/template.marko_0_x 1"];M._.w()</script>
 ```
 
 # Render End
@@ -19,8 +19,7 @@
         {
           x: 1
         }]),
-        "__tests__/template.marko_0_x",
-        1
+        "__tests__/template.marko_0_x 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/self-reference-function-named/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/self-reference-function-named/__snapshots__/resume.expected.md
index 4c1b33d8a..4e7ac2ff2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/self-reference-function-named/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/self-reference-function-named/__snapshots__/resume.expected.md
@@ -15,8 +15,7 @@
         {
           items: [0, 1, 2]
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -45,8 +44,7 @@ container.querySelector("button").click();
         {
           items: [0, 1, 2]
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -79,8 +77,7 @@ container.querySelector("button").click();
         {
           items: [0, 1, 2]
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
@@ -113,8 +110,7 @@ container.querySelector("button").click();
         {
           items: [0, 1, 2]
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/self-reference-function-named/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/self-reference-function-named/__snapshots__/ssr.expected.md
index 5bcda9c70..62dfaa8b8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/self-reference-function-named/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/self-reference-function-named/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button></button><!--M_*1 #button/0--><div>3<!--M_*1 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{items:[0,1,2]}]),"__tests__/template.marko_0_items",1];M._.w()</script>
+  <button></button><!--M_*1 #button/0--><div>3<!--M_*1 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{items:[0,1,2]}]),"__tests__/template.marko_0_items 1"];M._.w()</script>
 ```
 
 # Render End
@@ -20,8 +20,7 @@
         {
           items: [0, 1, 2]
         }]),
-        "__tests__/template.marko_0_items",
-        1
+        "__tests__/template.marko_0_items 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/self-reference-native-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/self-reference-native-tag/__snapshots__/resume.expected.md
index bf452702a..03c76ebca 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/self-reference-native-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/self-reference-native-tag/__snapshots__/resume.expected.md
@@ -9,8 +9,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -35,8 +34,7 @@ container.querySelector("button").click();
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/self-reference-native-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/self-reference-native-tag/__snapshots__/ssr.expected.md
index 477a01424..4e8486c83 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/self-reference-native-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/self-reference-native-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <button></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -14,8 +14,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/serialize-promise/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/serialize-promise/__snapshots__/resume.expected.md
index 36841e577..a1507d32c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/serialize-promise/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/serialize-promise/__snapshots__/resume.expected.md
@@ -21,8 +21,7 @@
             }
           }))()
         }]), _ =&gt; (_.a.f("hello"), _.c = []),
-        "__tests__/template.marko_0_promise",
-        1
+        "__tests__/template.marko_0_promise 1"
       ];
       M._.w()
     </script>
@@ -54,8 +53,7 @@
             }
           }))()
         }]), _ =&gt; (_.a.f("hello"), _.c = []),
-        "__tests__/template.marko_0_promise",
-        1
+        "__tests__/template.marko_0_promise 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/serialize-promise/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/serialize-promise/__snapshots__/ssr.expected.md
index 323ae03a8..b1c326454 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/serialize-promise/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/serialize-promise/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div id=ref>0</div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{promise:(p=>p=new Promise((f,r)=>_.a={f,r(e){p.catch(_=>0);r(e)}}))()}]),_=>(_.a.f("hello"),_.c=[]),"__tests__/template.marko_0_promise",1];M._.w()</script>
+  <div id=ref>0</div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,{promise:(p=>p=new Promise((f,r)=>_.a={f,r(e){p.catch(_=>0);r(e)}}))()}]),_=>(_.a.f("hello"),_.c=[]),"__tests__/template.marko_0_promise 1"];M._.w()</script>
 ```
 
 # Render End
@@ -26,8 +26,7 @@
             }
           }))()
         }]), _ =&gt; (_.a.f("hello"), _.c = []),
-        "__tests__/template.marko_0_promise",
-        1
+        "__tests__/template.marko_0_promise 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/resume.expected.md
index c74e96f78..625187dee 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/resume.expected.md
@@ -40,14 +40,7 @@
           $count2: 0,
           $count3: 0
         }]),
-        "__tests__/template.marko_0_$count3",
-        1,
-        "__tests__/template.marko_0_$count2",
-        1,
-        "__tests__/template.marko_0_$count",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_$count3 1 __tests__/template.marko_0_$count2 1 __tests__/template.marko_0_$count 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -101,14 +94,7 @@ container.querySelectorAll("button")[buttonNum++].click();
           $count2: 0,
           $count3: 0
         }]),
-        "__tests__/template.marko_0_$count3",
-        1,
-        "__tests__/template.marko_0_$count2",
-        1,
-        "__tests__/template.marko_0_$count",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_$count3 1 __tests__/template.marko_0_$count2 1 __tests__/template.marko_0_$count 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -166,14 +152,7 @@ container.querySelectorAll("button")[buttonNum++].click();
           $count2: 0,
           $count3: 0
         }]),
-        "__tests__/template.marko_0_$count3",
-        1,
-        "__tests__/template.marko_0_$count2",
-        1,
-        "__tests__/template.marko_0_$count",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_$count3 1 __tests__/template.marko_0_$count2 1 __tests__/template.marko_0_$count 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -231,14 +210,7 @@ container.querySelectorAll("button")[buttonNum++].click();
           $count2: 0,
           $count3: 0
         }]),
-        "__tests__/template.marko_0_$count3",
-        1,
-        "__tests__/template.marko_0_$count2",
-        1,
-        "__tests__/template.marko_0_$count",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_$count3 1 __tests__/template.marko_0_$count2 1 __tests__/template.marko_0_$count 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -296,14 +268,7 @@ container.querySelectorAll("button")[buttonNum++].click();
           $count2: 0,
           $count3: 0
         }]),
-        "__tests__/template.marko_0_$count3",
-        1,
-        "__tests__/template.marko_0_$count2",
-        1,
-        "__tests__/template.marko_0_$count",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_$count3 1 __tests__/template.marko_0_$count2 1 __tests__/template.marko_0_$count 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -361,14 +326,7 @@ buttonNum = 0;
           $count2: 0,
           $count3: 0
         }]),
-        "__tests__/template.marko_0_$count3",
-        1,
-        "__tests__/template.marko_0_$count2",
-        1,
-        "__tests__/template.marko_0_$count",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_$count3 1 __tests__/template.marko_0_$count2 1 __tests__/template.marko_0_$count 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/ssr.expected.md
index 0616afcd4..ad0485e8b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><div><button>0<!--M_*1 #text/3--></button><!--M_*1 #button/2--><div><button>0<!--M_*1 #text/5--></button><!--M_*1 #button/4--></div></div></div><div><button>0<!--M_*1 #text/7--></button><!--M_*1 #button/6--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0,$count:0,$count2:0,$count3:0}]),"__tests__/template.marko_0_$count3",1,"__tests__/template.marko_0_$count2",1,"__tests__/template.marko_0_$count",1,"__tests__/template.marko_0_count",1];M._.w()</script>
+  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><div><button>0<!--M_*1 #text/3--></button><!--M_*1 #button/2--><div><button>0<!--M_*1 #text/5--></button><!--M_*1 #button/4--></div></div></div><div><button>0<!--M_*1 #text/7--></button><!--M_*1 #button/6--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0,$count:0,$count2:0,$count3:0}]),"__tests__/template.marko_0_$count3 1 __tests__/template.marko_0_$count2 1 __tests__/template.marko_0_$count 1 __tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -45,14 +45,7 @@
           $count2: 0,
           $count3: 0
         }]),
-        "__tests__/template.marko_0_$count3",
-        1,
-        "__tests__/template.marko_0_$count2",
-        1,
-        "__tests__/template.marko_0_$count",
-        1,
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_$count3 1 __tests__/template.marko_0_$count2 1 __tests__/template.marko_0_$count 1 __tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/static-text-followed-by-placeholder/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/static-text-followed-by-placeholder/__snapshots__/resume.expected.md
index 52f793d3c..df1b3b77c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/static-text-followed-by-placeholder/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/static-text-followed-by-placeholder/__snapshots__/resume.expected.md
@@ -17,8 +17,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -49,8 +48,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -85,8 +83,7 @@ container.querySelector("button").click();
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/static-text-followed-by-placeholder/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/static-text-followed-by-placeholder/__snapshots__/ssr.expected.md
index 7e14c7fd6..70b6e716d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/static-text-followed-by-placeholder/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/static-text-followed-by-placeholder/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  = <!>0<!--M_*1 #text/0--><button>Inc</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count",1];M._.w()</script>
+  = <!>0<!--M_*1 #text/0--><button>Inc</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{count:0}]),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
         {
           count: 0
         }]),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/style-attr-toggle-with-static-content/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/style-attr-toggle-with-static-content/__snapshots__/resume.expected.md
index 7e9e269d7..630e8c4c5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/style-attr-toggle-with-static-content/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/style-attr-toggle-with-static-content/__snapshots__/resume.expected.md
@@ -17,8 +17,7 @@
         {
           open: !0
         }]),
-        "__tests__/template.marko_0_open",
-        1
+        "__tests__/template.marko_0_open 1"
       ];
       M._.w()
     </script>
@@ -49,8 +48,7 @@ container.querySelector("button").click();
         {
           open: !0
         }]),
-        "__tests__/template.marko_0_open",
-        1
+        "__tests__/template.marko_0_open 1"
       ];
       M._.w()
     </script>
@@ -85,8 +83,7 @@ container.querySelector("button").click();
         {
           open: !0
         }]),
-        "__tests__/template.marko_0_open",
-        1
+        "__tests__/template.marko_0_open 1"
       ];
       M._.w()
     </script>
@@ -121,8 +118,7 @@ container.querySelector("button").click();
         {
           open: !0
         }]),
-        "__tests__/template.marko_0_open",
-        1
+        "__tests__/template.marko_0_open 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/style-attr-toggle-with-static-content/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/style-attr-toggle-with-static-content/__snapshots__/ssr.expected.md
index 3d06e4945..373dc31b1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/style-attr-toggle-with-static-content/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/style-attr-toggle-with-static-content/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button></button><!--M_*1 #button/0--><div style="border:1px solid black">foo bar</div><!--M_*1 #div/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{open:!0}]),"__tests__/template.marko_0_open",1];M._.w()</script>
+  <button></button><!--M_*1 #button/0--><div style="border:1px solid black">foo bar</div><!--M_*1 #div/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{open:!0}]),"__tests__/template.marko_0_open 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
         {
           open: !0
         }]),
-        "__tests__/template.marko_0_open",
-        1
+        "__tests__/template.marko_0_open 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-param-if-closure/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/tag-param-if-closure/__snapshots__/resume.expected.md
index a9a6f725c..dd204a455 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-param-if-closure/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-param-if-closure/__snapshots__/resume.expected.md
@@ -24,8 +24,7 @@
         }], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.b), _.c),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -67,8 +66,7 @@ container?.querySelector("button").click();
         }], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.b), _.c),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-param-if-closure/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/tag-param-if-closure/__snapshots__/ssr.expected.md
index d6fc0cd6a..87715a394 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-param-if-closure/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-param-if-closure/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Increment</button><!--M_*1 #button/0--><!--M_[--><!--M_|3 #text/0--><!--M_]2 #text/0 3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.b={count:0,a:"abc","#childScope/1":_.a={"ConditionalRenderer:#text/0":"__tests__/template.marko_1_content"}},_.a,{_:_.b}],_.a.input_content=_._["__tests__/template.marko_1_content"](_.b),_.c),"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button>Increment</button><!--M_*1 #button/0--><!--M_[--><!--M_|3 #text/0--><!--M_]2 #text/0 3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.b={count:0,a:"abc","#childScope/1":_.a={"ConditionalRenderer:#text/0":"__tests__/template.marko_1_content"}},_.a,{_:_.b}],_.a.input_content=_._["__tests__/template.marko_1_content"](_.b),_.c),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -29,8 +29,7 @@
         }], _.a.input_content = _._[
           "__tests__/template.marko_1_content"
           ](_.b), _.c),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/resume.expected.md
index 01ab23012..eade86a8d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/resume.expected.md
@@ -40,8 +40,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -95,8 +94,7 @@ container?.querySelector("button").click();
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/ssr.expected.md
index 86b77896b..c92c3a269 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button><pre>a    1    <!>0<!--M_*1 #text/1--></pre><pre>b    2    <!>0<!--M_*1 #text/2--></pre><pre>c  {c:4}  <!>{}<!--M_*1 #text/3--></pre><pre>d    7    <!>0<!--M_*1 #text/4--></pre><pre>f   [9]   <!>[]<!--M_*1 #text/5--></pre></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <button><pre>a    1    <!>0<!--M_*1 #text/1--></pre><pre>b    2    <!>0<!--M_*1 #text/2--></pre><pre>c  {c:4}  <!>{}<!--M_*1 #text/3--></pre><pre>d    7    <!>0<!--M_*1 #text/4--></pre><pre>f   [9]   <!>[]<!--M_*1 #text/5--></pre></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -45,8 +45,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-var-rest/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/tag-var-rest/__snapshots__/resume.expected.md
index d9bc9023c..8a208332e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-var-rest/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-var-rest/__snapshots__/resume.expected.md
@@ -41,8 +41,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -97,8 +96,7 @@ container.querySelector("button").click();
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-var-rest/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/tag-var-rest/__snapshots__/ssr.expected.md
index de358b810..1dd164a08 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-var-rest/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-var-rest/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div class=obj>{"a":1,"b":2,"c":3}<!--M_*1 #text/0--></div><div class=partialObj>{"b":2,"c":3}<!--M_*1 #text/1--></div><div class=a>1<!--M_*1 #text/2--></div><div class=b>2<!--M_*1 #text/3--></div><div class=a>removed a<!--M_*1 #text/4--></div><button>Update</button><!--M_*1 #button/5--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <div class=obj>{"a":1,"b":2,"c":3}<!--M_*1 #text/0--></div><div class=partialObj>{"b":2,"c":3}<!--M_*1 #text/1--></div><div class=a>1<!--M_*1 #text/2--></div><div class=b>2<!--M_*1 #text/3--></div><div class=a>removed a<!--M_*1 #text/4--></div><button>Update</button><!--M_*1 #button/5--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -46,8 +46,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-var-with-serialize-reason/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/tag-var-with-serialize-reason/__snapshots__/resume.expected.md
index 50b3a089c..0565f4d5b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-var-with-serialize-reason/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-var-with-serialize-reason/__snapshots__/resume.expected.md
@@ -20,8 +20,7 @@
         {}], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_x/var"
           ](_.c), _.b),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -55,8 +54,7 @@ container.querySelector("button").click();
         {}], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_x/var"
           ](_.c), _.b),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -96,8 +94,7 @@ container.querySelector("button").click();
         {}], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_x/var"
           ](_.c), _.b),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
@@ -135,8 +132,7 @@ container.querySelector("button").click();
         {}], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_x/var"
           ](_.c), _.b),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-var-with-serialize-reason/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/tag-var-with-serialize-reason/__snapshots__/ssr.expected.md
index 5c4a8e055..d4010c11d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-var-with-serialize-reason/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-var-with-serialize-reason/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><span></span><!--M_|2 #text/0 3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"#scopeOffset/3":4,count:1,"#childScope/2":_.a={}},_.a,{}],_.a["#TagVariable"]=_._["__tests__/template.marko_0_x/var"](_.c),_.b),"__tests__/template.marko_0_count",1];M._.w()</script>
+  <button>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><span></span><!--M_|2 #text/0 3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={"#scopeOffset/3":4,count:1,"#childScope/2":_.a={}},_.a,{}],_.a["#TagVariable"]=_._["__tests__/template.marko_0_x/var"](_.c),_.b),"__tests__/template.marko_0_count 1"];M._.w()</script>
 ```
 
 # Render End
@@ -25,8 +25,7 @@
         {}], _.a["#TagVariable"] = _._[
           "__tests__/template.marko_0_x/var"
           ](_.c), _.b),
-        "__tests__/template.marko_0_count",
-        1
+        "__tests__/template.marko_0_count 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/text-content-counter/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/text-content-counter/__snapshots__/resume.expected.md
index 141b8cbb7..1cf9add2c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/text-content-counter/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/text-content-counter/__snapshots__/resume.expected.md
@@ -17,8 +17,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -54,8 +53,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -91,8 +89,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
@@ -128,8 +125,7 @@ container.querySelector("button").click();
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/text-content-counter/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/text-content-counter/__snapshots__/ssr.expected.md
index 73f1d6892..bb5013cee 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/text-content-counter/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/text-content-counter/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><button id=button>0</button><!--M_*1 #button/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{clickCount:0}]),"__tests__/template.marko_0_clickCount",1];M._.w()</script>
+  <div><button id=button>0</button><!--M_*1 #button/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{clickCount:0}]),"__tests__/template.marko_0_clickCount 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
         {
           clickCount: 0
         }]),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/textarea-dynamic-text/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/textarea-dynamic-text/__snapshots__/resume.expected.md
index 99891c138..9aa80ddc9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/textarea-dynamic-text/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/textarea-dynamic-text/__snapshots__/resume.expected.md
@@ -15,8 +15,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -45,8 +44,7 @@ container.querySelector("button").click();
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/textarea-dynamic-text/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/textarea-dynamic-text/__snapshots__/ssr.expected.md
index a3deae1ed..214556fd5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/textarea-dynamic-text/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/textarea-dynamic-text/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <textarea>before</textarea><!--M_*1 #textarea/0--><button>update</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <textarea>before</textarea><!--M_*1 #textarea/0--><button>update</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -20,8 +20,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/resume.expected.md
index ad44dddb6..dd4a0816c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/resume.expected.md
@@ -36,12 +36,7 @@
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -95,12 +90,7 @@ container.querySelector("#count").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -154,12 +144,7 @@ container.querySelector("#count").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -207,12 +192,7 @@ container.querySelector("#inner").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -266,12 +246,7 @@ container.querySelector("#inner").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -325,12 +300,7 @@ container.querySelector("#count").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -371,12 +341,7 @@ container.querySelector("#outer").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -432,12 +397,7 @@ container.querySelector("#outer").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -490,12 +450,7 @@ container.querySelector("#count").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/ssr.expected.md
index 6444b2b34..7ab5cc469 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><button id=outer></button><!--M_*1 #button/0--><!--M_[--><button id=inner></button><!--M_*2 #button/0--><button id=count>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><!--M_|2 #text/1 3--><!--M_]1 #text/1 2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={outer:!0,inner:!0,count:0,"ClosureScopes:count":_.d=new Set},_.b={_:_.a},_.e={_:_.b,"ClosureSignalIndex:count":0}],(_.d).add(_.e),_.c),"__tests__/template.marko_2_count",3,"__tests__/template.marko_1_inner",2,"__tests__/template.marko_0_outer",1];M._.w()</script>
+  <div><button id=outer></button><!--M_*1 #button/0--><!--M_[--><button id=inner></button><!--M_*2 #button/0--><button id=count>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><!--M_|2 #text/1 3--><!--M_]1 #text/1 2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={outer:!0,inner:!0,count:0,"ClosureScopes:count":_.d=new Set},_.b={_:_.a},_.e={_:_.b,"ClosureSignalIndex:count":0}],(_.d).add(_.e),_.c),"__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"];M._.w()</script>
 ```
 
 # Render End
@@ -41,12 +41,7 @@
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-3/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-3/__snapshots__/resume.expected.md
index 3303f7bc6..b5b9acf16 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-3/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-3/__snapshots__/resume.expected.md
@@ -37,12 +37,7 @@
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -97,12 +92,7 @@ container.querySelector("#count").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -157,12 +147,7 @@ container.querySelector("#count").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -211,12 +196,7 @@ container.querySelector("#inner").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -271,12 +251,7 @@ container.querySelector("#inner").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -331,12 +306,7 @@ container.querySelector("#count").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -378,12 +348,7 @@ container.querySelector("#outer").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -440,12 +405,7 @@ container.querySelector("#outer").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
@@ -499,12 +459,7 @@ container.querySelector("#count").click();
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-3/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-3/__snapshots__/ssr.expected.md
index fa262c59f..25770a041 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-3/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-3/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><button id=outer></button><!--M_*1 #button/0--><!--M_[--><button id=inner></button><!--M_*2 #button/0--><button id=count>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><!--M_|2 #text/1 3--><!--M_]1 #text/1 2--> hello</div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={outer:!0,inner:!0,count:0,"ClosureScopes:count":_.d=new Set},_.b={_:_.a},_.e={_:_.b,"ClosureSignalIndex:count":0}],(_.d).add(_.e),_.c),"__tests__/template.marko_2_count",3,"__tests__/template.marko_1_inner",2,"__tests__/template.marko_0_outer",1];M._.w()</script>
+  <div><button id=outer></button><!--M_*1 #button/0--><!--M_[--><button id=inner></button><!--M_*2 #button/0--><button id=count>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><!--M_|2 #text/1 3--><!--M_]1 #text/1 2--> hello</div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={outer:!0,inner:!0,count:0,"ClosureScopes:count":_.d=new Set},_.b={_:_.a},_.e={_:_.b,"ClosureSignalIndex:count":0}],(_.d).add(_.e),_.c),"__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"];M._.w()</script>
 ```
 
 # Render End
@@ -42,12 +42,7 @@
           _: _.b,
           "ClosureSignalIndex:count": 0
         }], (_.d).add(_.e), _.c),
-        "__tests__/template.marko_2_count",
-        3,
-        "__tests__/template.marko_1_inner",
-        2,
-        "__tests__/template.marko_0_outer",
-        1
+        "__tests__/template.marko_2_count 3 __tests__/template.marko_1_inner 2 __tests__/template.marko_0_outer 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child-with-marker/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child-with-marker/__snapshots__/resume.expected.md
index b0d0915ff..d914b28fb 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child-with-marker/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child-with-marker/__snapshots__/resume.expected.md
@@ -16,8 +16,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -46,8 +45,7 @@ container.querySelector("button").click();
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -81,8 +79,7 @@ container.querySelector("button").click();
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child-with-marker/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child-with-marker/__snapshots__/ssr.expected.md
index 5568c7171..a6d0dfb75 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child-with-marker/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child-with-marker/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button><span id=count>0</span></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0",1];M._.w()</script>
+  <button><span id=count>0</span></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{}]),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -20,8 +20,7 @@
       WALKER_RUNTIME("M")("_");
       M._.r = [_ =&gt; (_.a = [0,
         {}]),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child/__snapshots__/resume.expected.md
index 26cbcae77..4483ef517 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child/__snapshots__/resume.expected.md
@@ -26,8 +26,7 @@
         }], _.a["ControlledHandler:#input/1"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -62,8 +61,7 @@ input.dispatchEvent(new input.ownerDocument.defaultView.Event("input", {
         }], _.a["ControlledHandler:#input/1"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -108,8 +106,7 @@ input.dispatchEvent(new input.ownerDocument.defaultView.Event("input", {
         }], _.a["ControlledHandler:#input/1"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
@@ -155,8 +152,7 @@ input.dispatchEvent(new input.ownerDocument.defaultView.Event("input", {
         }], _.a["ControlledHandler:#input/1"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child/__snapshots__/ssr.expected.md
index d9717d31d..aef7ac27e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><span>Hello<!--M_*2 #text/0--></span><!--M_}1 #div/0 2--></div><input value=Hello><!--M_*1 #input/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#input/1":2,value:"Hello"},{_:_.a}],_.a["ControlledHandler:#input/1"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0",1];M._.w()</script>
+  <div><span>Hello<!--M_*2 #text/0--></span><!--M_}1 #div/0 2--></div><input value=Hello><!--M_*1 #input/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ControlledType:#input/1":2,value:"Hello"},{_:_.a}],_.a["ControlledHandler:#input/1"]=_._["__tests__/template.marko_0/valueChange"](_.a),_.b),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -30,8 +30,7 @@
         }], _.a["ControlledHandler:#input/1"] = _._[
           "__tests__/template.marko_0/valueChange"
           ](_.a), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/resume.expected.md
index 5acdf0342..e2259015c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/resume.expected.md
@@ -22,8 +22,7 @@
         }], _.a.onCount = _.b.input_onCount = _._[
           "__tests__/template.marko_0/onCount"
           ](_.a), _.c),
-        "__tests__/tags/counter.marko_0_input_onCount_clickCount",
-        3
+        "__tests__/tags/counter.marko_0_input_onCount_clickCount 3"
       ];
       M._.w()
     </script>
@@ -50,8 +49,7 @@ container.querySelector("button").click();
         }], _.a.onCount = _.b.input_onCount = _._[
           "__tests__/template.marko_0/onCount"
           ](_.a), _.c),
-        "__tests__/tags/counter.marko_0_input_onCount_clickCount",
-        3
+        "__tests__/tags/counter.marko_0_input_onCount_clickCount 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/ssr.expected.md
index ea1bb557c..9d0b17e74 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><div><button>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--></div><!--M_}1 #div/0 2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={},{},_.b={clickCount:0,"#ClosestBranchId":2}],_.a.onCount=_.b.input_onCount=_._["__tests__/template.marko_0/onCount"](_.a),_.c),"__tests__/tags/counter.marko_0_input_onCount_clickCount",3];M._.w()</script>
+  <div><div><button>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--></div><!--M_}1 #div/0 2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={},{},_.b={clickCount:0,"#ClosestBranchId":2}],_.a.onCount=_.b.input_onCount=_._["__tests__/template.marko_0/onCount"](_.a),_.c),"__tests__/tags/counter.marko_0_input_onCount_clickCount 3"];M._.w()</script>
 ```
 
 # Render End
@@ -27,8 +27,7 @@
         }], _.a.onCount = _.b.input_onCount = _._[
           "__tests__/template.marko_0/onCount"
           ](_.a), _.c),
-        "__tests__/tags/counter.marko_0_input_onCount_clickCount",
-        3
+        "__tests__/tags/counter.marko_0_input_onCount_clickCount 3"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/trailing-tag-dynamic-attr/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/trailing-tag-dynamic-attr/__snapshots__/resume.expected.md
index d7008766c..36ac55110 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/trailing-tag-dynamic-attr/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/trailing-tag-dynamic-attr/__snapshots__/resume.expected.md
@@ -13,8 +13,7 @@
         {
           toggle: !1
         }]),
-        "__tests__/template.marko_0_toggle",
-        1
+        "__tests__/template.marko_0_toggle 1"
       ];
       M._.w()
     </script>
@@ -44,8 +43,7 @@ container.querySelector("button")?.click();
         {
           toggle: !1
         }]),
-        "__tests__/template.marko_0_toggle",
-        1
+        "__tests__/template.marko_0_toggle 1"
       ];
       M._.w()
     </script>
@@ -77,8 +75,7 @@ container.querySelector("button")?.click();
         {
           toggle: !1
         }]),
-        "__tests__/template.marko_0_toggle",
-        1
+        "__tests__/template.marko_0_toggle 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/trailing-tag-dynamic-attr/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/trailing-tag-dynamic-attr/__snapshots__/ssr.expected.md
index 016043f0b..b7921b224 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/trailing-tag-dynamic-attr/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/trailing-tag-dynamic-attr/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <html><body><button>Toggle</button><!--M_*1 #button/1--></body><!--M_*1 #body/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{toggle:!1}]),"__tests__/template.marko_0_toggle",1];M._.w()</script></html>
+  <html><body><button>Toggle</button><!--M_*1 #button/1--></body><!--M_*1 #body/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{toggle:!1}]),"__tests__/template.marko_0_toggle 1"];M._.w()</script></html>
 ```
 
 # Render End
@@ -18,8 +18,7 @@
         {
           toggle: !1
         }]),
-        "__tests__/template.marko_0_toggle",
-        1
+        "__tests__/template.marko_0_toggle 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/try-effects-async/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/try-effects-async/__snapshots__/resume.expected.md
index 3c3e2e93e..f5be397d8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/try-effects-async/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/try-effects-async/__snapshots__/resume.expected.md
@@ -41,15 +41,14 @@
           ](_.a), _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.j[2] = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_1_clickCount",
-          2)
+          "__tests__/template.marko_1_clickCount 2"
+          )
       };
       M._.w()
     </script>
@@ -109,15 +108,14 @@ container.querySelector("button").click();
           ](_.a), _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.j[2] = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_1_clickCount",
-          2)
+          "__tests__/template.marko_1_clickCount 2"
+          )
       };
       M._.w()
     </script>
@@ -166,15 +164,14 @@ container.querySelector("button").click();
           ](_.a), _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.j[2] = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_1_clickCount",
-          2)
+          "__tests__/template.marko_1_clickCount 2"
+          )
       };
       M._.w()
     </script>
@@ -246,15 +243,14 @@ REMOVE #document-fragment/#text3 after html/body/#text
           ](_.a), _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.j[2] = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_1_clickCount",
-          2)
+          "__tests__/template.marko_1_clickCount 2"
+          )
       };
       M._.w()
     </script>
@@ -321,15 +317,14 @@ container.querySelector("button").click();
           ](_.a), _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.j[2] = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_1_clickCount",
-          2)
+          "__tests__/template.marko_1_clickCount 2"
+          )
       };
       M._.w()
     </script>
@@ -378,15 +373,14 @@ container.querySelector("button").click();
           ](_.a), _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.j[2] = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_1_clickCount",
-          2)
+          "__tests__/template.marko_1_clickCount 2"
+          )
       };
       M._.w()
     </script>
@@ -450,15 +444,14 @@ REMOVE #document-fragment/#text3 after html/body/#text
           ](_.a), _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.j[2] = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_1_clickCount",
-          2)
+          "__tests__/template.marko_1_clickCount 2"
+          )
       };
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/try-effects-async/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/try-effects-async/__snapshots__/ssr.expected.md
index 2c64297a2..c069df32b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/try-effects-async/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/try-effects-async/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>inc</button><!--M_*1 #button/0--><div></div><!--M_*1 #div/1--><!--M_[--><!--M_!^b--><!--M_!^2-->LOADING...<!--M_!2--><!--M_!b--><!--M_]1 #text/2 2--><style M_>t{display:none}</style><t M_=2><!--M_#c--></t><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={clickCount:0,"ClosureScopes:clickCount":_.d=new Set},_.b={_:_.a,"ClosureSignalIndex:clickCount":0,"#BranchAccessor":"#text/2"}],_.b["#CatchContent"]=_._["__tests__/template.marko_3_content"](_.a),_.b["#PlaceholderContent"]=_._["__tests__/template.marko_2_content"](_.a),(_.d).add(_.b),_.c),"__tests__/template.marko_0_clickCount",1];REORDER_RUNTIME(M._);M._.j[2]=_=>{_.push("__tests__/template.marko_1_clickCount",2)};M._.w()</script>
+  <button>inc</button><!--M_*1 #button/0--><div></div><!--M_*1 #div/1--><!--M_[--><!--M_!^b--><!--M_!^2-->LOADING...<!--M_!2--><!--M_!b--><!--M_]1 #text/2 2--><style M_>t{display:none}</style><t M_=2><!--M_#c--></t><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={clickCount:0,"ClosureScopes:clickCount":_.d=new Set},_.b={_:_.a,"ClosureSignalIndex:clickCount":0,"#BranchAccessor":"#text/2"}],_.b["#CatchContent"]=_._["__tests__/template.marko_3_content"](_.a),_.b["#PlaceholderContent"]=_._["__tests__/template.marko_2_content"](_.a),(_.d).add(_.b),_.c),"__tests__/template.marko_0_clickCount 1"];REORDER_RUNTIME(M._);M._.j[2]=_=>{_.push("__tests__/template.marko_1_clickCount 2")};M._.w()</script>
 ```
 
 # Write
@@ -46,15 +46,14 @@
           ](_.a), _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.j[2] = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_1_clickCount",
-          2)
+          "__tests__/template.marko_1_clickCount 2"
+          )
       };
       M._.w()
     </script>
@@ -130,15 +129,14 @@ INSERT html/body/script
           ](_.a), _.b["#PlaceholderContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_0_clickCount",
-        1
+        "__tests__/template.marko_0_clickCount 1"
       ];
       REORDER_RUNTIME(M._);
       M._.j[2] = _ =&gt;
       {
         _.push(
-          "__tests__/template.marko_1_clickCount",
-          2)
+          "__tests__/template.marko_1_clickCount 2"
+          )
       };
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch-state/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch-state/__snapshots__/resume.expected.md
index 70c20531c..c61ced916 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch-state/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch-state/__snapshots__/resume.expected.md
@@ -29,8 +29,7 @@
         }], _.b["#CatchContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_1_clickCount",
-        2
+        "__tests__/template.marko_1_clickCount 2"
       ];
       M._.w()
     </script>
@@ -78,8 +77,7 @@ container.querySelector("button").click();
         }], _.b["#CatchContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_1_clickCount",
-        2
+        "__tests__/template.marko_1_clickCount 2"
       ];
       M._.w()
     </script>
@@ -119,8 +117,7 @@ container.querySelector("button").click();
         }], _.b["#CatchContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_1_clickCount",
-        2
+        "__tests__/template.marko_1_clickCount 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch-state/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch-state/__snapshots__/ssr.expected.md
index d36953ba3..99274cee4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch-state/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch-state/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><!--M_[--><button>inc</button><!--M_*2 #button/0--> -- <!>&zwj;<!--M_*2 #text/1--><!--M_]1 #text/1 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={clickCount:0,"ClosureScopes:clickCount":_.d=new Set},_.b={_:_.a,"ClosureSignalIndex:clickCount":0,"#BranchAccessor":"#text/1"}],_.b["#CatchContent"]=_._["__tests__/template.marko_2_content"](_.a),(_.d).add(_.b),_.c),"__tests__/template.marko_1_clickCount",2];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><!--M_[--><button>inc</button><!--M_*2 #button/0--> -- <!>&zwj;<!--M_*2 #text/1--><!--M_]1 #text/1 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c=[0,_.a={clickCount:0,"ClosureScopes:clickCount":_.d=new Set},_.b={_:_.a,"ClosureSignalIndex:clickCount":0,"#BranchAccessor":"#text/1"}],_.b["#CatchContent"]=_._["__tests__/template.marko_2_content"](_.a),(_.d).add(_.b),_.c),"__tests__/template.marko_1_clickCount 2"];M._.w()</script>
 ```
 
 # Render End
@@ -32,8 +32,7 @@
         }], _.b["#CatchContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.a), (_.d).add(_.b), _.c),
-        "__tests__/template.marko_1_clickCount",
-        2
+        "__tests__/template.marko_1_clickCount 2"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch/__snapshots__/resume.expected.md
index a1a39085d..545e3d3c1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch/__snapshots__/resume.expected.md
@@ -19,8 +19,7 @@
         }], _.a["#CatchContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.c), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch/__snapshots__/ssr.expected.md
index 622390e68..bc77f5a4e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/try-effects-catch/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div></div><!--M_*1 #div/0--><!--M_[-->ERROR!<!--M_]1 #text/1 2--><div></div><!--M_*1 #div/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={},_.a={"#BranchAccessor":"#text/1"}],_.a["#CatchContent"]=_._["__tests__/template.marko_2_content"](_.c),_.b),"__tests__/template.marko_0",1];M._.w()</script>
+  <div></div><!--M_*1 #div/0--><!--M_[-->ERROR!<!--M_]1 #text/1 2--><div></div><!--M_*1 #div/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.c={},_.a={"#BranchAccessor":"#text/1"}],_.a["#CatchContent"]=_._["__tests__/template.marko_2_content"](_.c),_.b),"__tests__/template.marko_0 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
         }], _.a["#CatchContent"] = _._[
           "__tests__/template.marko_2_content"
           ](_.c), _.b),
-        "__tests__/template.marko_0",
-        1
+        "__tests__/template.marko_0 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/resume.expected.md
index 7f77f63d6..77ecd2519 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/resume.expected.md
@@ -30,10 +30,7 @@
           },
           a: 0
         }]),
-        "__tests__/template.marko_0_input_value_a",
-        1,
-        "__tests__/template.marko_0_input_value",
-        1
+        "__tests__/template.marko_0_input_value_a 1 __tests__/template.marko_0_input_value 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/ssr.expected.md
index 2f0947cd6..14508e925 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div a=1 b=2></div><!--M_*1 #div/0--><div a=1 b=2></div><!--M_*1 #div/1--><div a=0 b=2></div><!--M_*1 #div/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{input_value:{a:1,b:2},a:0}]),"__tests__/template.marko_0_input_value_a",1,"__tests__/template.marko_0_input_value",1];M._.w()</script>
+  <div a=1 b=2></div><!--M_*1 #div/0--><div a=1 b=2></div><!--M_*1 #div/1--><div a=0 b=2></div><!--M_*1 #div/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{input_value:{a:1,b:2},a:0}]),"__tests__/template.marko_0_input_value_a 1 __tests__/template.marko_0_input_value 1"];M._.w()</script>
 ```
 
 # Render End
@@ -34,10 +34,7 @@
           },
           a: 0
         }]),
-        "__tests__/template.marko_0_input_value_a",
-        1,
-        "__tests__/template.marko_0_input_value",
-        1
+        "__tests__/template.marko_0_input_value_a 1 __tests__/template.marko_0_input_value 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/resume.expected.md
index 7b9563bee..d4d361ea7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/resume.expected.md
@@ -18,8 +18,7 @@
         {
           input_value: 0
         }]),
-        "__tests__/template.marko_0_input_value",
-        1
+        "__tests__/template.marko_0_input_value 1"
       ];
       M._.w()
     </script>
@@ -47,8 +46,7 @@
         {
           input_value: 0
         }]),
-        "__tests__/template.marko_0_input_value",
-        1
+        "__tests__/template.marko_0_input_value 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/ssr.expected.md
index d86727aff..c2b0feaa0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div>0<!--M_*1 #text/0--> <!>0<!--M_*1 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{input_value:0}]),"__tests__/template.marko_0_input_value",1];M._.w()</script>
+  <div>0<!--M_*1 #text/0--> <!>0<!--M_*1 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{input_value:0}]),"__tests__/template.marko_0_input_value 1"];M._.w()</script>
 ```
 
 # Render End
@@ -22,8 +22,7 @@
         {
           input_value: 0
         }]),
-        "__tests__/template.marko_0_input_value",
-        1
+        "__tests__/template.marko_0_input_value 1"
       ];
       M._.w()
     </script>
diff --git a/packages/runtime-tags/src/dom/resume.ts b/packages/runtime-tags/src/dom/resume.ts
index 38b18e83d..f3f2b5368 100644
--- a/packages/runtime-tags/src/dom/resume.ts
+++ b/packages/runtime-tags/src/dom/resume.ts
@@ -26,7 +26,7 @@ export interface RenderData {
   // Marked nodes to visit
   v: Comment[];
   // Resumes
-  r?: (string | number | ResumeFn)[];
+  r?: (string | ResumeFn)[];
   // Scope lookup (just needed for compat layer)
   s?: Record<string, Scope>;
   // Walk
@@ -189,36 +189,41 @@ export function init(runtimeId = DEFAULT_RUNTIME_ID) {
             };
           })();
         let $global: Scope[AccessorProp.Global] | undefined;
-        let lastEffect: string | undefined;
+        let lastEffect: unknown;
         let visits: RenderData["v"];
         let resumes: NonNullable<RenderData["r"]>;
         let visit: Comment;
         let visitText: string;
         let visitType: ResumeSymbol;
         let visitScope: Scope;
-        let lastToken: string | 0;
+        let lastToken: string;
         let lastTokenIndex: number;
         let lastScopeId = 0;
         const nextToken = () =>
           (lastToken = visitText.slice(
             lastTokenIndex,
-            // eslint-disable-next-line no-cond-assign
-            (lastTokenIndex = visitText.indexOf(" ", lastTokenIndex) + 1)
-              ? lastTokenIndex - 1
-              : visitText.length,
+            (lastTokenIndex =
+              visitText.indexOf(" ", lastTokenIndex) + 1 ||
+              visitText.length + 1) - 1,
           ));
 
         render.m = (effects: unknown[] = []) => {
           for (const serialized of (resumes = render.r || [])) {
             if (typeof serialized === "string") {
-              lastEffect = serialized;
-            } else if (typeof serialized === "number") {
-              effects.push(
-                registeredValues[lastEffect!],
-                (scopeLookup[serialized] ||= {
-                  [AccessorProp.Id]: serialized,
-                } as Scope),
-              );
+              lastTokenIndex = 0;
+              visitText = serialized;
+              while (nextToken()) {
+                if (/\D/.test(lastToken)) {
+                  lastEffect = registeredValues[lastToken];
+                } else {
+                  effects.push(
+                    lastEffect,
+                    (scopeLookup[lastToken] ||= {
+                      [AccessorProp.Id]: +lastToken,
+                    } as Scope),
+                  );
+                }
+              }
             } else {
               for (const scope of serialized(serializeContext)) {
                 if (!$global) {
diff --git a/packages/runtime-tags/src/html/writer.ts b/packages/runtime-tags/src/html/writer.ts
index 0f4a55de8..ce73ecbe8 100644
--- a/packages/runtime-tags/src/html/writer.ts
+++ b/packages/runtime-tags/src/html/writer.ts
@@ -1101,13 +1101,10 @@ export class Chunk {
 
   writeEffect(scopeId: number, registryId: string) {
     if (this.lastEffect === registryId) {
-      this.effects += "," + scopeId;
+      this.effects += " " + scopeId;
     } else {
       this.lastEffect = registryId;
-      this.effects = concatEffects(
-        this.effects,
-        '"' + registryId + '",' + scopeId,
-      );
+      this.effects = concatEffects(this.effects, registryId + " " + scopeId);
     }
   }
 
@@ -1220,7 +1217,9 @@ export class Chunk {
 
     if (effects) {
       needsWalk = true;
-      state.resumes = state.resumes ? state.resumes + "," + effects : effects;
+      state.resumes = state.resumes
+        ? state.resumes + ',"' + effects + '"'
+        : '"' + effects + '"';
     }
 
     if (state.resumes) {
@@ -1297,7 +1296,7 @@ export class Chunk {
 
           reorderScripts = concatScripts(
             reorderScripts,
-            "_.push(" + reorderEffects + ")",
+            '_.push("' + reorderEffects + '")',
           );
         }
 
@@ -1392,7 +1391,7 @@ function flushSerializer(boundary: Boundary) {
       serializeData.push(scope);
     }
 
-    state.resumes = concatEffects(
+    state.resumes = concatSequence(
       state.resumes,
       serializer.stringify(serializeData, boundary),
     );
@@ -1409,6 +1408,10 @@ export function _trailers(html: string) {
 }
 
 function concatEffects(a: string, b: string) {
+  return a ? (b ? a + " " + b : a) : b;
+}
+
+function concatSequence(a: string, b: string) {
   return a ? (b ? a + "," + b : a) : b;
 }
 
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 bd534e019..5fe4594e1 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<!--Ms*1 #text/1-->,<!>10<!--Ms*1 #text/2--></button><!--Ms*1 #button/0--><!--Ms[--><div>Counts: 1,10</div><!--Ms]1 #text/3 2--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/3":_._.$compat_renderBody,input_content:_._.$compat_renderBody,x:1,y:10}]),"__tests__/components/custom-tag.marko_0_x_y",1];M.s.w()</script>
+  <button class=inc>1<!--Ms*1 #text/1-->,<!>10<!--Ms*1 #text/2--></button><!--Ms*1 #button/0--><!--Ms[--><div>Counts: 1,10</div><!--Ms]1 #text/3 2--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,{"ConditionalRenderer:#text/3":_._.$compat_renderBody,input_content:_._.$compat_renderBody,x:1,y:10}]),"__tests__/components/custom-tag.marko_0_x_y 1"];M.s.w()</script>
 
 # Render End
 ```html
@@ -31,8 +31,7 @@
           x: 1,
           y: 10
         }]),
-        "__tests__/components/custom-tag.marko_0_x_y",
-        1
+        "__tests__/components/custom-tag.marko_0_x_y 1"
       ];
       M.s.w()
     </script>
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 0defdc441..e2298642e 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
@@ -22,9 +22,8 @@
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -88,9 +87,8 @@ container.querySelector("#tags").click();
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -143,9 +141,8 @@ container.querySelector("#class").click();
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -199,9 +196,8 @@ container.querySelector("#tags").click();
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -254,9 +250,8 @@ container.querySelector("#class").click();
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -310,9 +305,8 @@ container.querySelector("#tags").click();
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
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 88ed8b4e8..039eeba58 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<!--Ms*1 #text/1--></button><!--Ms*1 #button/0--><!--F/--><!--M/--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,{m5c:"s0-1",count:0}]),"$compat_setScope",1,"__tests__/components/tags-counter.marko_0_count",1];M.s.w();$MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"f":1}]],"t":["__tests__/template.marko"]})</script>
+  <!--M#s0--><button id=class>0</button><!--F#1--><button id=tags data-parent=0>0<!--Ms*1 #text/1--></button><!--Ms*1 #button/0--><!--F/--><!--M/--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,{m5c:"s0-1",count:0}]),"$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"];M.s.w();$MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"f":1}]],"t":["__tests__/template.marko"]})</script>
 
 # Render End
 ```html
@@ -29,9 +29,8 @@
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
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 2290c83a9..1de6caa88 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
@@ -47,9 +47,9 @@
           "__tests__/components/class-counter.marko"
         ]
       });
-      M._.r.push("$compat_setScope", 2,
-        "__tests__/template.marko_0_count",
-        1);
+      M._.r.push(
+        "$compat_setScope 2 __tests__/template.marko_0_count 1"
+        );
       M._.w()
     </script>
   </body>
@@ -117,9 +117,9 @@ container.querySelector("#tags").click();
           "__tests__/components/class-counter.marko"
         ]
       });
-      M._.r.push("$compat_setScope", 2,
-        "__tests__/template.marko_0_count",
-        1);
+      M._.r.push(
+        "$compat_setScope 2 __tests__/template.marko_0_count 1"
+        );
       M._.w()
     </script>
   </body>
@@ -184,9 +184,9 @@ container.querySelector("#class").click();
           "__tests__/components/class-counter.marko"
         ]
       });
-      M._.r.push("$compat_setScope", 2,
-        "__tests__/template.marko_0_count",
-        1);
+      M._.r.push(
+        "$compat_setScope 2 __tests__/template.marko_0_count 1"
+        );
       M._.w()
     </script>
   </body>
@@ -250,9 +250,9 @@ container.querySelector("#tags").click();
           "__tests__/components/class-counter.marko"
         ]
       });
-      M._.r.push("$compat_setScope", 2,
-        "__tests__/template.marko_0_count",
-        1);
+      M._.r.push(
+        "$compat_setScope 2 __tests__/template.marko_0_count 1"
+        );
       M._.w()
     </script>
   </body>
@@ -317,9 +317,9 @@ container.querySelector("#class").click();
           "__tests__/components/class-counter.marko"
         ]
       });
-      M._.r.push("$compat_setScope", 2,
-        "__tests__/template.marko_0_count",
-        1);
+      M._.r.push(
+        "$compat_setScope 2 __tests__/template.marko_0_count 1"
+        );
       M._.w()
     </script>
   </body>
@@ -383,9 +383,9 @@ container.querySelector("#tags").click();
           "__tests__/components/class-counter.marko"
         ]
       });
-      M._.r.push("$compat_setScope", 2,
-        "__tests__/template.marko_0_count",
-        1);
+      M._.r.push(
+        "$compat_setScope 2 __tests__/template.marko_0_count 1"
+        );
       M._.w()
     </script>
   </body>
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 bffb15fcf..ed450258f 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_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[--><!--M#_0--><button id=class data-parent=0>0</button><!--M/--><!--M_]1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ConditionalRenderer:#text/2":_._["__tests__/components/class-counter.marko"],count:0},{m5c:"_0"}],_.a["ConditionalRenderer:#text/2"]=_._.$compat_renderer(_.a["ConditionalRenderer:#text/2"]),_.b)];M._.w();$MC=(window.$MC||[]).concat({"p":"_","w":[["_0",0,{"count":0},{"f":1}]],"t":["__tests__/components/class-counter.marko"]});M._.r.push("$compat_setScope",2,"__tests__/template.marko_0_count",1);M._.w()</script>
+  <button id=tags>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[--><!--M#_0--><button id=class data-parent=0>0</button><!--M/--><!--M_]1 #text/2 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ConditionalRenderer:#text/2":_._["__tests__/components/class-counter.marko"],count:0},{m5c:"_0"}],_.a["ConditionalRenderer:#text/2"]=_._.$compat_renderer(_.a["ConditionalRenderer:#text/2"]),_.b)];M._.w();$MC=(window.$MC||[]).concat({"p":"_","w":[["_0",0,{"count":0},{"f":1}]],"t":["__tests__/components/class-counter.marko"]});M._.r.push("$compat_setScope 2 __tests__/template.marko_0_count 1");M._.w()</script>
 
 # Render End
 ```html
@@ -52,9 +52,9 @@
           "__tests__/components/class-counter.marko"
         ]
       });
-      M._.r.push("$compat_setScope", 2,
-        "__tests__/template.marko_0_count",
-        1);
+      M._.r.push(
+        "$compat_setScope 2 __tests__/template.marko_0_count 1"
+        );
       M._.w()
     </script>
   </body>
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/resume.expected.md
index 2b1b0d5cd..93df4c978 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/resume.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
       M.s.r = [_ =&gt; (_.a = [0, 1,
       {
         m5c: "s1"
-      }]), "$compat_setScope", 2];
+      }]), "$compat_setScope 2"];
       M.s.w();
       $MC = (window.$MC || []).concat(
       {
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/ssr.expected.md
index 49c7d7d24..e07fb13d0 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/ssr.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!--M#s1--><h1>Hello world</h1><!--M/--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,1,{m5c:"s1"}]),"$compat_setScope",2];M.s.w();$MC=(window.$MC||[]).concat({"w":[["s1",0,{},{"f":1}]],"t":["__tests__/tags/components/hello-internal.marko"]})</script>
+  <!--M#s1--><h1>Hello world</h1><!--M/--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,1,{m5c:"s1"}]),"$compat_setScope 2"];M.s.w();$MC=(window.$MC||[]).concat({"w":[["s1",0,{},{"f":1}]],"t":["__tests__/tags/components/hello-internal.marko"]})</script>
 
 # Render End
 ```html
@@ -16,7 +16,7 @@
       M.s.r = [_ =&gt; (_.a = [0, 1,
       {
         m5c: "s1"
-      }]), "$compat_setScope", 2];
+      }]), "$compat_setScope 2"];
       M.s.w();
       $MC = (window.$MC || []).concat(
       {
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-to-tags-import/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-class-to-tags-import/__snapshots__/resume.expected.md
index 0defdc441..e2298642e 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-class-to-tags-import/__snapshots__/resume.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-to-tags-import/__snapshots__/resume.expected.md
@@ -22,9 +22,8 @@
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -88,9 +87,8 @@ container.querySelector("#tags").click();
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -143,9 +141,8 @@ container.querySelector("#class").click();
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -199,9 +196,8 @@ container.querySelector("#tags").click();
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -254,9 +250,8 @@ container.querySelector("#class").click();
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -310,9 +305,8 @@ container.querySelector("#tags").click();
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-to-tags-import/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-class-to-tags-import/__snapshots__/ssr.expected.md
index 88ed8b4e8..039eeba58 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-class-to-tags-import/__snapshots__/ssr.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-to-tags-import/__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<!--Ms*1 #text/1--></button><!--Ms*1 #button/0--><!--F/--><!--M/--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,{m5c:"s0-1",count:0}]),"$compat_setScope",1,"__tests__/components/tags-counter.marko_0_count",1];M.s.w();$MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"f":1}]],"t":["__tests__/template.marko"]})</script>
+  <!--M#s0--><button id=class>0</button><!--F#1--><button id=tags data-parent=0>0<!--Ms*1 #text/1--></button><!--Ms*1 #button/0--><!--F/--><!--M/--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,{m5c:"s0-1",count:0}]),"$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"];M.s.w();$MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"f":1}]],"t":["__tests__/template.marko"]})</script>
 
 # Render End
 ```html
@@ -29,9 +29,8 @@
         {
           m5c: "s0-1",
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-counter.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-counter.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-event-handler-render-body-tags-to-class/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-event-handler-render-body-tags-to-class/__snapshots__/resume.expected.md
index f0463f059..c1df2ada0 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-event-handler-render-body-tags-to-class/__snapshots__/resume.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-event-handler-render-body-tags-to-class/__snapshots__/resume.expected.md
@@ -27,7 +27,7 @@
       }], _.a["ConditionalRenderer:#text/0"] = _._.$compat_renderer(_.a[
         "ConditionalRenderer:#text/0"]), (_.c).add(_.d), _.b), _ =&gt; (_.e = [
         -3, _.a
-      ]), "$compat_setScope", 3];
+      ]), "$compat_setScope 3"];
       M._.w();
       $MC = (window.$MC || []).concat(
       {
@@ -62,7 +62,7 @@
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -118,7 +118,7 @@ container.querySelector("button").click();
       }], _.a["ConditionalRenderer:#text/0"] = _._.$compat_renderer(_.a[
         "ConditionalRenderer:#text/0"]), (_.c).add(_.d), _.b), _ =&gt; (_.e = [
         -3, _.a
-      ]), "$compat_setScope", 3];
+      ]), "$compat_setScope 3"];
       M._.w();
       $MC = (window.$MC || []).concat(
       {
@@ -153,7 +153,7 @@ container.querySelector("button").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -197,7 +197,7 @@ container.querySelector("button").click();
       }], _.a["ConditionalRenderer:#text/0"] = _._.$compat_renderer(_.a[
         "ConditionalRenderer:#text/0"]), (_.c).add(_.d), _.b), _ =&gt; (_.e = [
         -3, _.a
-      ]), "$compat_setScope", 3];
+      ]), "$compat_setScope 3"];
       M._.w();
       $MC = (window.$MC || []).concat(
       {
@@ -232,7 +232,7 @@ container.querySelector("button").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -276,7 +276,7 @@ container.querySelector("button").click();
       }], _.a["ConditionalRenderer:#text/0"] = _._.$compat_renderer(_.a[
         "ConditionalRenderer:#text/0"]), (_.c).add(_.d), _.b), _ =&gt; (_.e = [
         -3, _.a
-      ]), "$compat_setScope", 3];
+      ]), "$compat_setScope 3"];
       M._.w();
       $MC = (window.$MC || []).concat(
       {
@@ -311,7 +311,7 @@ container.querySelector("button").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-event-handler-render-body-tags-to-class/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-event-handler-render-body-tags-to-class/__snapshots__/ssr.expected.md
index 19d077ef7..dd8ede289 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-event-handler-render-body-tags-to-class/__snapshots__/ssr.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-event-handler-render-body-tags-to-class/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!--M_[--><!--M#_0--><button><!--F#1-->0<!--M_*3 #text/0--><!--F/--></button><!--M/--><!--M_]1 #text/0 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ConditionalRenderer:#text/0":_._["__tests__/components/my-button.marko"],count:0,"ClosureScopes:count":_.c=new Set},{m5c:"_0"},_.d={m5c:"_0-1",_:_.a,"ClosureSignalIndex:count":0}],_.a["ConditionalRenderer:#text/0"]=_._.$compat_renderer(_.a["ConditionalRenderer:#text/0"]),(_.c).add(_.d),_.b),_=>(_.e=[-3,_.a]),"$compat_setScope",3];M._.w();$MC=(window.$MC||[]).concat({"o":{"p":"_","w":[["_0",0,{"renderBody":["__tests__/template.marko_1_content",1]},{"e":[["click",["__tests__/template.marko_0/onClick",1]]],"f":1}]],"t":["__tests__/components/my-button.marko"]},"$$":[{"l":["w",0,3,"r"],"r":["w",0,2,"renderBody"]}]});M._.r.push("$compat_setScope",2);M._.w()</script>
+  <!--M_[--><!--M#_0--><button><!--F#1-->0<!--M_*3 #text/0--><!--F/--></button><!--M/--><!--M_]1 #text/0 2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={"ConditionalRenderer:#text/0":_._["__tests__/components/my-button.marko"],count:0,"ClosureScopes:count":_.c=new Set},{m5c:"_0"},_.d={m5c:"_0-1",_:_.a,"ClosureSignalIndex:count":0}],_.a["ConditionalRenderer:#text/0"]=_._.$compat_renderer(_.a["ConditionalRenderer:#text/0"]),(_.c).add(_.d),_.b),_=>(_.e=[-3,_.a]),"$compat_setScope 3"];M._.w();$MC=(window.$MC||[]).concat({"o":{"p":"_","w":[["_0",0,{"renderBody":["__tests__/template.marko_1_content",1]},{"e":[["click",["__tests__/template.marko_0/onClick",1]]],"f":1}]],"t":["__tests__/components/my-button.marko"]},"$$":[{"l":["w",0,3,"r"],"r":["w",0,2,"renderBody"]}]});M._.r.push("$compat_setScope 2");M._.w()</script>
 
 # Render End
 ```html
@@ -34,7 +34,7 @@
       }], _.a["ConditionalRenderer:#text/0"] = _._.$compat_renderer(_.a[
         "ConditionalRenderer:#text/0"]), (_.c).add(_.d), _.b), _ =&gt; (_.e = [
         -3, _.a
-      ]), "$compat_setScope", 3];
+      ]), "$compat_setScope 3"];
       M._.w();
       $MC = (window.$MC || []).concat(
       {
@@ -69,7 +69,7 @@
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
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 7a3db33f4..cf03920f7 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
@@ -42,7 +42,7 @@
           "__tests__/components/class-counter.marko"
         ]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -104,7 +104,7 @@ container.querySelector("#class-api").click();
           "__tests__/components/class-counter.marko"
         ]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -164,7 +164,7 @@ container.querySelector("#class-api").click();
           "__tests__/components/class-counter.marko"
         ]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
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 dee3307fb..cf916d13c 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#_0--><button id=class-api>0</button><!--M/--><div id=tags-api>0<!--M_*1 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{},{m5c:"_0"}]),_=>(_.c=[-2,_.b=_.a[1]])];M._.w();$MC=(window.$MC||[]).concat({"p":"_","w":[["_0",0,{},{"e":[["count",["__tests__/template.marko_0/onCount",1]]],"f":1}]],"t":["__tests__/components/class-counter.marko"]});M._.r.push("$compat_setScope",2);M._.w()</script>
+  <!--M#_0--><button id=class-api>0</button><!--M/--><div id=tags-api>0<!--M_*1 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a=[0,{},{m5c:"_0"}]),_=>(_.c=[-2,_.b=_.a[1]])];M._.w();$MC=(window.$MC||[]).concat({"p":"_","w":[["_0",0,{},{"e":[["count",["__tests__/template.marko_0/onCount",1]]],"f":1}]],"t":["__tests__/components/class-counter.marko"]});M._.r.push("$compat_setScope 2");M._.w()</script>
 
 # Render End
 ```html
@@ -47,7 +47,7 @@
           "__tests__/components/class-counter.marko"
         ]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-nested-attr-tags-class-to-tags/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-nested-attr-tags-class-to-tags/__snapshots__/resume.expected.md
index 776be78bb..3f733e584 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-nested-attr-tags-class-to-tags/__snapshots__/resume.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-nested-attr-tags-class-to-tags/__snapshots__/resume.expected.md
@@ -25,9 +25,8 @@
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -103,9 +102,8 @@ container.querySelector("#tags").click();
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -161,9 +159,8 @@ container.querySelector("#class").click();
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -228,9 +225,8 @@ container.querySelector("#tags").click();
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -286,9 +282,8 @@ container.querySelector("#class").click();
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -353,9 +348,8 @@ container.querySelector("#tags").click();
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-nested-attr-tags-class-to-tags/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-nested-attr-tags-class-to-tags/__snapshots__/ssr.expected.md
index 934314957..f9b59e8c5 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-nested-attr-tags-class-to-tags/__snapshots__/ssr.expected.md
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-nested-attr-tags-class-to-tags/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  <!--M#s0--><!--F#1--><button id=tags>0<!--Ms*1 #text/1--></button><!--Ms*1 #button/0--><div><!--Ms[--><button id=class>0</button><!--Ms]1 #text/2 2--></div><!--F/--><!--M/--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,{m5c:"s0-0","ConditionalRenderer:#text/2":_._.$compat_renderBody,count:0}]),"$compat_setScope",1,"__tests__/components/tags-layout.marko_0_count",1];M.s.w();$MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"f":1}]],"t":["__tests__/template.marko"]})</script>
+  <!--M#s0--><!--F#1--><button id=tags>0<!--Ms*1 #text/1--></button><!--Ms*1 #button/0--><div><!--Ms[--><button id=class>0</button><!--Ms]1 #text/2 2--></div><!--F/--><!--M/--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,{m5c:"s0-0","ConditionalRenderer:#text/2":_._.$compat_renderBody,count:0}]),"$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"];M.s.w();$MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"f":1}]],"t":["__tests__/template.marko"]})</script>
 
 # Render End
 ```html
@@ -33,9 +33,8 @@
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
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 776be78bb..3f733e584 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
@@ -25,9 +25,8 @@
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -103,9 +102,8 @@ container.querySelector("#tags").click();
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -161,9 +159,8 @@ container.querySelector("#class").click();
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -228,9 +225,8 @@ container.querySelector("#tags").click();
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -286,9 +282,8 @@ container.querySelector("#class").click();
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -353,9 +348,8 @@ container.querySelector("#tags").click();
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
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 934314957..f9b59e8c5 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#1--><button id=tags>0<!--Ms*1 #text/1--></button><!--Ms*1 #button/0--><div><!--Ms[--><button id=class>0</button><!--Ms]1 #text/2 2--></div><!--F/--><!--M/--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,{m5c:"s0-0","ConditionalRenderer:#text/2":_._.$compat_renderBody,count:0}]),"$compat_setScope",1,"__tests__/components/tags-layout.marko_0_count",1];M.s.w();$MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"f":1}]],"t":["__tests__/template.marko"]})</script>
+  <!--M#s0--><!--F#1--><button id=tags>0<!--Ms*1 #text/1--></button><!--Ms*1 #button/0--><div><!--Ms[--><button id=class>0</button><!--Ms]1 #text/2 2--></div><!--F/--><!--M/--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,{m5c:"s0-0","ConditionalRenderer:#text/2":_._.$compat_renderBody,count:0}]),"$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"];M.s.w();$MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"f":1}]],"t":["__tests__/template.marko"]})</script>
 
 # Render End
 ```html
@@ -33,9 +33,8 @@
           m5c: "s0-0",
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
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 52fe578e0..a2980acd0 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
@@ -29,10 +29,8 @@
           m5c: "_0-2",
           _: _.a,
           "ClosureSignalIndex:count": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_count",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_count 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -62,7 +60,7 @@
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -119,10 +117,8 @@ container.querySelector("#tags").click();
           m5c: "_0-2",
           _: _.a,
           "ClosureSignalIndex:count": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_count",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_count 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -152,7 +148,7 @@ container.querySelector("#tags").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -198,10 +194,8 @@ container.querySelector("#class").click();
           m5c: "_0-2",
           _: _.a,
           "ClosureSignalIndex:count": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_count",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_count 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -231,7 +225,7 @@ container.querySelector("#class").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -277,10 +271,8 @@ container.querySelector("#tags").click();
           m5c: "_0-2",
           _: _.a,
           "ClosureSignalIndex:count": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_count",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_count 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -310,7 +302,7 @@ container.querySelector("#tags").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -356,10 +348,8 @@ container.querySelector("#class").click();
           m5c: "_0-2",
           _: _.a,
           "ClosureSignalIndex:count": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_count",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_count 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -389,7 +379,7 @@ container.querySelector("#class").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -435,10 +425,8 @@ container.querySelector("#tags").click();
           m5c: "_0-2",
           _: _.a,
           "ClosureSignalIndex:count": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_count",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_count 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -468,7 +456,7 @@ container.querySelector("#tags").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
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 14084897a..9b3e38bd2 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,5 +1,5 @@
 # Write
-  <!--M#_0--><button id=class>0</button><div><!--F#1--><button id=tags>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><!--F/--></div><!--M/--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={count:0,"ClosureScopes:count":_.c=new Set},{m5c:"_0"},_.d={m5c:"_0-2",_:_.a,"ClosureSignalIndex:count":0}],(_.c).add(_.d),_.b),_=>(_.e=[-3,_.a]),"$compat_setScope",3,"__tests__/template.marko_1_count",3];M._.w();$MC=(window.$MC||[]).concat({"o":{"p":"_","w":[["_0",0,{"renderBody":["__tests__/template.marko_1_content",1]},{"f":1}]],"t":["__tests__/components/class-layout.marko"]},"$$":[{"l":["w",0,3,"r"],"r":["w",0,2,"renderBody"]}]});M._.r.push("$compat_setScope",2);M._.w()</script>
+  <!--M#_0--><button id=class>0</button><div><!--F#1--><button id=tags>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><!--F/--></div><!--M/--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={count:0,"ClosureScopes:count":_.c=new Set},{m5c:"_0"},_.d={m5c:"_0-2",_:_.a,"ClosureSignalIndex:count":0}],(_.c).add(_.d),_.b),_=>(_.e=[-3,_.a]),"$compat_setScope 3 __tests__/template.marko_1_count 3"];M._.w();$MC=(window.$MC||[]).concat({"o":{"p":"_","w":[["_0",0,{"renderBody":["__tests__/template.marko_1_content",1]},{"f":1}]],"t":["__tests__/components/class-layout.marko"]},"$$":[{"l":["w",0,3,"r"],"r":["w",0,2,"renderBody"]}]});M._.r.push("$compat_setScope 2");M._.w()</script>
 
 # Render End
 ```html
@@ -36,10 +36,8 @@
           m5c: "_0-2",
           _: _.a,
           "ClosureSignalIndex:count": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_count",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_count 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -69,7 +67,7 @@
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
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 f4a85fc78..71f7956bd 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
@@ -29,9 +29,8 @@
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           input_content: _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -118,9 +117,8 @@ container.querySelector("#tags").click();
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           input_content: _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -182,9 +180,8 @@ container.querySelector("#class").click();
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           input_content: _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -260,9 +257,8 @@ container.querySelector("#tags").click();
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           input_content: _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -324,9 +320,8 @@ container.querySelector("#class").click();
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           input_content: _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
@@ -402,9 +397,8 @@ container.querySelector("#tags").click();
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           input_content: _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
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 214fb13d5..ed45f091f 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#1--><button id=tags>0<!--Ms*1 #text/1--></button><!--Ms*1 #button/0--><div><!--Ms[--><h1>hello</h1><button id=class>1 * 0 = 0</button><!--Ms]1 #text/2 2--></div><!--F/--><!--M/--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,{m5c:"s0-0","ConditionalRenderer:#text/2":_._.$compat_renderBody,input_content:_._.$compat_renderBody,count:0}]),"$compat_setScope",1,"__tests__/components/tags-layout.marko_0_count",1];M.s.w();$MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"f":1}]],"t":["__tests__/template.marko"]})</script>
+  <!--M#s0--><!--F#1--><button id=tags>0<!--Ms*1 #text/1--></button><!--Ms*1 #button/0--><div><!--Ms[--><h1>hello</h1><button id=class>1 * 0 = 0</button><!--Ms]1 #text/2 2--></div><!--F/--><!--M/--><script>WALKER_RUNTIME("M")("s");M.s.r=[_=>(_.a=[0,{m5c:"s0-0","ConditionalRenderer:#text/2":_._.$compat_renderBody,input_content:_._.$compat_renderBody,count:0}]),"$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"];M.s.w();$MC=(window.$MC||[]).concat({"w":[["s0",0,{},{"f":1}]],"t":["__tests__/template.marko"]})</script>
 
 # Render End
 ```html
@@ -37,9 +37,8 @@
           "ConditionalRenderer:#text/2": _._.$compat_renderBody,
           input_content: _._.$compat_renderBody,
           count: 0
-        }]), "$compat_setScope", 1,
-        "__tests__/components/tags-layout.marko_0_count",
-        1
+        }]),
+        "$compat_setScope 1 __tests__/components/tags-layout.marko_0_count 1"
       ];
       M.s.w();
       $MC = (window.$MC || []).concat(
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 1656a18ee..2ce8fd800 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
@@ -42,10 +42,8 @@
           baseCount: 0,
           _: _.a,
           "ClosureSignalIndex:multiplier": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_multiplier",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_multiplier 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -75,7 +73,7 @@
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -145,10 +143,8 @@ container.querySelector("#tags").click();
           baseCount: 0,
           _: _.a,
           "ClosureSignalIndex:multiplier": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_multiplier",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_multiplier 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -178,7 +174,7 @@ container.querySelector("#tags").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -237,10 +233,8 @@ container.querySelector("#class").click();
           baseCount: 0,
           _: _.a,
           "ClosureSignalIndex:multiplier": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_multiplier",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_multiplier 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -270,7 +264,7 @@ container.querySelector("#class").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -331,10 +325,8 @@ container.querySelector("#tags").click();
           baseCount: 0,
           _: _.a,
           "ClosureSignalIndex:multiplier": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_multiplier",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_multiplier 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -364,7 +356,7 @@ container.querySelector("#tags").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -424,10 +416,8 @@ container.querySelector("#class").click();
           baseCount: 0,
           _: _.a,
           "ClosureSignalIndex:multiplier": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_multiplier",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_multiplier 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -457,7 +447,7 @@ container.querySelector("#class").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
@@ -518,10 +508,8 @@ container.querySelector("#tags").click();
           baseCount: 0,
           _: _.a,
           "ClosureSignalIndex:multiplier": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_multiplier",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_multiplier 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -551,7 +539,7 @@ container.querySelector("#tags").click();
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>
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 c562a6ab3..0ede89fc9 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,5 +1,5 @@
 # Write
-  <!--M#_0--><button id=class>0</button><div><!--F#1--><h1>hello<!--M_*3 #text/0--></h1><button id=tags>1<!--M_*3 #text/2--> * <!>0<!--M_*3 #text/3--> = <!>0<!--M_*3 #text/4--></button><!--M_*3 #button/1--><!--F/--></div><!--M/--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={multiplier:1,"ClosureScopes:multiplier":_.c=new Set},{m5c:"_0"},_.d={m5c:"_0-2",baseCount:0,_:_.a,"ClosureSignalIndex:multiplier":0}],(_.c).add(_.d),_.b),_=>(_.e=[-3,_.a]),"$compat_setScope",3,"__tests__/template.marko_1_multiplier",3];M._.w();$MC=(window.$MC||[]).concat({"o":{"p":"_","w":[["_0",0,{"renderBody":["__tests__/template.marko_1_content",1]},{"f":1}]],"t":["__tests__/components/class-layout.marko"]},"$$":[{"l":["w",0,3,"r"],"r":["w",0,2,"renderBody"]}]});M._.r.push("$compat_setScope",2);M._.w()</script>
+  <!--M#_0--><button id=class>0</button><div><!--F#1--><h1>hello<!--M_*3 #text/0--></h1><button id=tags>1<!--M_*3 #text/2--> * <!>0<!--M_*3 #text/3--> = <!>0<!--M_*3 #text/4--></button><!--M_*3 #button/1--><!--F/--></div><!--M/--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b=[0,_.a={multiplier:1,"ClosureScopes:multiplier":_.c=new Set},{m5c:"_0"},_.d={m5c:"_0-2",baseCount:0,_:_.a,"ClosureSignalIndex:multiplier":0}],(_.c).add(_.d),_.b),_=>(_.e=[-3,_.a]),"$compat_setScope 3 __tests__/template.marko_1_multiplier 3"];M._.w();$MC=(window.$MC||[]).concat({"o":{"p":"_","w":[["_0",0,{"renderBody":["__tests__/template.marko_1_content",1]},{"f":1}]],"t":["__tests__/components/class-layout.marko"]},"$$":[{"l":["w",0,3,"r"],"r":["w",0,2,"renderBody"]}]});M._.r.push("$compat_setScope 2");M._.w()</script>
 
 # Render End
 ```html
@@ -49,10 +49,8 @@
           baseCount: 0,
           _: _.a,
           "ClosureSignalIndex:multiplier": 0
-        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]), "$compat_setScope",
-        3,
-        "__tests__/template.marko_1_multiplier",
-        3
+        }], (_.c).add(_.d), _.b), _ =&gt; (_.e = [-3, _.a]),
+        "$compat_setScope 3 __tests__/template.marko_1_multiplier 3"
       ];
       M._.w();
       $MC = (window.$MC || []).concat(
@@ -82,7 +80,7 @@
           "r": ["w", 0, 2, "renderBody"]
         }]
       });
-      M._.r.push("$compat_setScope", 2);
+      M._.r.push("$compat_setScope 2");
       M._.w()
     </script>
   </body>