diff --git a/packages/marko/src/runtime/components/beginComponent.js b/packages/marko/src/runtime/components/beginComponent.js
index 441796532d..87e26c3c00 100644
--- a/packages/marko/src/runtime/components/beginComponent.js
+++ b/packages/marko/src/runtime/components/beginComponent.js
@@ -65,7 +65,7 @@ module.exports = function beginComponent(
 
   if ((ownerIsRenderBoundary || ownerWillRerender) && key != null) {
     out.w(
-      "<!--" +
+      "<!" +
         runtimeId +
         "^" +
         componentId +
@@ -73,10 +73,10 @@ module.exports = function beginComponent(
         ownerComponentDef.id +
         " " +
         key +
-        "-->"
+        ">"
     );
   } else {
-    out.w("<!--" + runtimeId + "#" + componentId + "-->");
+    out.w("<!" + runtimeId + "#" + componentId + ">");
   }
 
   return componentDef;
diff --git a/packages/marko/src/runtime/components/endComponent.js b/packages/marko/src/runtime/components/endComponent.js
index 8296cc1e9b..56025bd6ac 100644
--- a/packages/marko/src/runtime/components/endComponent.js
+++ b/packages/marko/src/runtime/components/endComponent.js
@@ -5,7 +5,7 @@ var getComponentsContext = ComponentsContext.___getComponentsContext;
 
 module.exports = function endComponent(out, componentDef) {
   if (componentDef.___renderBoundary) {
-    out.w("<!--" + out.global.runtimeId + "/-->");
+    out.w("<!" + out.global.runtimeId + "/>");
     getComponentsContext(out).___isPreserved = componentDef.___parentPreserved;
   }
 };
diff --git a/packages/marko/src/runtime/html/AsyncStream.js b/packages/marko/src/runtime/html/AsyncStream.js
index 2fb9260308..5d8d0b726f 100644
--- a/packages/marko/src/runtime/html/AsyncStream.js
+++ b/packages/marko/src/runtime/html/AsyncStream.js
@@ -573,7 +573,7 @@ var proto = (AsyncStream.prototype = {
 
   ___beginFragment: function(key, component, preserve) {
     if (preserve) {
-      this.write("<!--F#" + escapeXmlString(key) + "-->");
+      this.write("<!F#" + escapeXmlString(key) + ">");
     }
     if (this._elStack) {
       this._elStack.push(preserve);
@@ -585,7 +585,7 @@ var proto = (AsyncStream.prototype = {
   ___endFragment: function() {
     var preserve = this._elStack.pop();
     if (preserve) {
-      this.write("<!--F/-->");
+      this.write("<!F/>");
     }
   },
 
diff --git a/packages/marko/src/runtime/html/helpers/attr.js b/packages/marko/src/runtime/html/helpers/attr.js
index b0870ea1d1..b2a87c9a9b 100644
--- a/packages/marko/src/runtime/html/helpers/attr.js
+++ b/packages/marko/src/runtime/html/helpers/attr.js
@@ -38,9 +38,9 @@ function notEmptyAttr(name, value) {
             );
           }
 
-          return " " + name + singleQuote(JSON.stringify(value));
+          return " " + name + singleQuote(JSON.stringify(value), 2);
         case RegExp.prototype.toString:
-          return " " + name + doubleQuote(value.source);
+          return " " + name + guessQuotes(value.source);
       }
   }
 
@@ -51,23 +51,29 @@ function isEmpty(value) {
   return value == null || value === false;
 }
 
-function doubleQuote(value) {
-  return '="' + escapeDoubleQuotes(value) + '"';
+function doubleQuote(value, startPos) {
+  return '="' + escapeDoubleQuotes(value, startPos) + '"';
 }
 
-function singleQuote(value) {
-  return "='" + escapeSingleQuotes(value) + "'";
+function singleQuote(value, startPos) {
+  return "='" + escapeSingleQuotes(value, startPos) + "'";
 }
 
 function guessQuotes(value) {
-  if (value.length) {
-    if (value[0] === "{") {
-      // Assume json.
-      return singleQuote(value);
+  for (var i = 0, len = value.length; i < len; i++) {
+    switch (value[i]) {
+      case '"':
+        return singleQuote(value, i + 1);
+      case "'":
+      case ">":
+      case " ":
+      case "\t":
+      case "\n":
+      case "\r":
+      case "\f":
+        return doubleQuote(value, i + 1);
     }
-
-    return doubleQuote(value);
   }
 
-  return "";
+  return value && "=" + value;
 }
diff --git a/packages/marko/src/runtime/html/helpers/escape-quotes.js b/packages/marko/src/runtime/html/helpers/escape-quotes.js
index f98d74445c..bed4280e3d 100644
--- a/packages/marko/src/runtime/html/helpers/escape-quotes.js
+++ b/packages/marko/src/runtime/html/helpers/escape-quotes.js
@@ -1,26 +1,26 @@
 "use strict";
 
 exports.d = function(value) {
-  return escapeDoubleQuotes(value + "");
+  return escapeDoubleQuotes(value + "", 0);
 };
 
 exports.___escapeDoubleQuotes = escapeDoubleQuotes;
 
 exports.___escapeSingleQuotes = escapeSingleQuotes;
 
-function escapeSingleQuotes(value) {
-  return escapeQuote(value, "'", "&#39;");
+function escapeSingleQuotes(value, startPos) {
+  return escapeQuote(value, startPos, "'", "&#39;");
 }
 
-function escapeDoubleQuotes(value) {
-  return escapeQuote(value, '"', "&#34;");
+function escapeDoubleQuotes(value, startPos) {
+  return escapeQuote(value, startPos, '"', "&#34;");
 }
 
-function escapeQuote(str, quote, escaped) {
+function escapeQuote(str, startPos, quote, escaped) {
   var result = "";
   var lastPos = 0;
 
-  for (var i = 0, len = str.length; i < len; i++) {
+  for (var i = startPos, len = str.length; i < len; i++) {
     if (str[i] === quote) {
       result += str.slice(lastPos, i) + escaped;
       lastPos = i + 1;
diff --git a/packages/marko/test/codegen/fixtures/code-before-after-if/expected.js b/packages/marko/test/codegen/fixtures/code-before-after-if/expected.js
index b480768e11..9f220e86cb 100644
--- a/packages/marko/test/codegen/fixtures/code-before-after-if/expected.js
+++ b/packages/marko/test/codegen/fixtures/code-before-after-if/expected.js
@@ -1,7 +1,7 @@
 if (a > b) {
   before();
 
-  out.w("<div class=\"greeting\">Hello World</div>");
+  out.w("<div class=greeting>Hello World</div>");
 
   after();
 }
diff --git a/packages/marko/test/codegen/fixtures/code-before-after/expected.js b/packages/marko/test/codegen/fixtures/code-before-after/expected.js
index d797a3ca9d..28eb7b6a20 100644
--- a/packages/marko/test/codegen/fixtures/code-before-after/expected.js
+++ b/packages/marko/test/codegen/fixtures/code-before-after/expected.js
@@ -1,5 +1,5 @@
 before();
 
-out.w("<div class=\"greeting\">Hello World</div>");
+out.w("<div class=greeting>Hello World</div>");
 
 after();
diff --git a/packages/marko/test/codegen/fixtures/container-codegen/expected.js b/packages/marko/test/codegen/fixtures/container-codegen/expected.js
index 3156b74869..fe0ea11d17 100644
--- a/packages/marko/test/codegen/fixtures/container-codegen/expected.js
+++ b/packages/marko/test/codegen/fixtures/container-codegen/expected.js
@@ -1 +1 @@
-out.w("<div class=\"greeting\">Hello World</div>")
\ No newline at end of file
+out.w("<div class=greeting>Hello World</div>")
\ No newline at end of file
diff --git a/packages/marko/test/codegen/fixtures/container/expected.js b/packages/marko/test/codegen/fixtures/container/expected.js
index 3156b74869..fe0ea11d17 100644
--- a/packages/marko/test/codegen/fixtures/container/expected.js
+++ b/packages/marko/test/codegen/fixtures/container/expected.js
@@ -1 +1 @@
-out.w("<div class=\"greeting\">Hello World</div>")
\ No newline at end of file
+out.w("<div class=greeting>Hello World</div>")
\ No newline at end of file
diff --git a/packages/marko/test/codegen/fixtures/htmlElement-attr-escape/expected.js b/packages/marko/test/codegen/fixtures/htmlElement-attr-escape/expected.js
index f057e4d607..e01d52e792 100644
--- a/packages/marko/test/codegen/fixtures/htmlElement-attr-escape/expected.js
+++ b/packages/marko/test/codegen/fixtures/htmlElement-attr-escape/expected.js
@@ -1,3 +1,3 @@
-out.w("<div class=\"greeting\"" +
+out.w("<div class=greeting" +
   marko_attr("foo", bar) +
   ">Hello World</div>")
\ No newline at end of file
diff --git a/packages/marko/test/codegen/fixtures/htmlElement-dynamic/expected.js b/packages/marko/test/codegen/fixtures/htmlElement-dynamic/expected.js
index 46532b1c91..b27bb10860 100644
--- a/packages/marko/test/codegen/fixtures/htmlElement-dynamic/expected.js
+++ b/packages/marko/test/codegen/fixtures/htmlElement-dynamic/expected.js
@@ -2,6 +2,6 @@ var tagName = data.tagName;
 
 out.w("<" +
   tagName +
-  " class=\"greeting\">Hello World</" +
+  " class=greeting>Hello World</" +
   tagName +
   ">");
diff --git a/packages/marko/test/codegen/fixtures/htmlElement/expected.js b/packages/marko/test/codegen/fixtures/htmlElement/expected.js
index 3156b74869..fe0ea11d17 100644
--- a/packages/marko/test/codegen/fixtures/htmlElement/expected.js
+++ b/packages/marko/test/codegen/fixtures/htmlElement/expected.js
@@ -1 +1 @@
-out.w("<div class=\"greeting\">Hello World</div>")
\ No newline at end of file
+out.w("<div class=greeting>Hello World</div>")
\ No newline at end of file
diff --git a/packages/marko/test/codegen/fixtures/insertSiblingAfter/expected.js b/packages/marko/test/codegen/fixtures/insertSiblingAfter/expected.js
index 9c77eb7d25..bb4d13e98e 100644
--- a/packages/marko/test/codegen/fixtures/insertSiblingAfter/expected.js
+++ b/packages/marko/test/codegen/fixtures/insertSiblingAfter/expected.js
@@ -1,5 +1,5 @@
 if (true) {
-  out.w("<div class=\"greeting\"><span class=\"foo\"></span>");
+  out.w("<div class=greeting><span class=foo></span>");
 
   var newVar = "Hello World";
 
diff --git a/packages/marko/test/codegen/fixtures/insertSiblingBefore/expected.js b/packages/marko/test/codegen/fixtures/insertSiblingBefore/expected.js
index 13fd5f27a8..47d230079f 100644
--- a/packages/marko/test/codegen/fixtures/insertSiblingBefore/expected.js
+++ b/packages/marko/test/codegen/fixtures/insertSiblingBefore/expected.js
@@ -1,7 +1,7 @@
 if (true) {
-  out.w("<div class=\"greeting\">");
+  out.w("<div class=greeting>");
 
   var newVar = "Hello World";
 
-  out.w("<span class=\"foo\"></span>Hello World</div>");
+  out.w("<span class=foo></span>Hello World</div>");
 }
diff --git a/packages/marko/test/codegen/fixtures/marko-template/expected.js b/packages/marko/test/codegen/fixtures/marko-template/expected.js
index 7a71ed61b5..9f339d2c2e 100644
--- a/packages/marko/test/codegen/fixtures/marko-template/expected.js
+++ b/packages/marko/test/codegen/fixtures/marko-template/expected.js
@@ -12,10 +12,10 @@ function render(input, out) {
     "!");
 
   if (notEmpty(data.colors)) {
-    out.w("<ul class=\"colors\">");
+    out.w("<ul class=colors>");
 
     forEach(data.colors, function(color) {
-      out.w("<li class=\"color\">" +
+      out.w("<li class=color>" +
         marko_escapeXml(color) +
         "</li>");
     });
diff --git a/packages/marko/test/codegen/fixtures/templateRoot/expected.js b/packages/marko/test/codegen/fixtures/templateRoot/expected.js
index 1b2fc3d6a8..cb0f08ccf6 100644
--- a/packages/marko/test/codegen/fixtures/templateRoot/expected.js
+++ b/packages/marko/test/codegen/fixtures/templateRoot/expected.js
@@ -7,7 +7,7 @@ function render(input, out) {
 
   var foo = "bar";
 
-  out.w("<div class=\"foo\"><span class=\"bar\"></span></div>");
+  out.w("<div class=foo><span class=bar></span></div>");
 }
 
 marko_template._ = render;
diff --git a/packages/marko/test/compiler/fixtures-html/keep-last-duplicated-attr/expected.js b/packages/marko/test/compiler/fixtures-html/keep-last-duplicated-attr/expected.js
index 4200b2998f..053df14136 100644
--- a/packages/marko/test/compiler/fixtures-html/keep-last-duplicated-attr/expected.js
+++ b/packages/marko/test/compiler/fixtures-html/keep-last-duplicated-attr/expected.js
@@ -16,7 +16,7 @@ function render(input, out, __component, component, state) {
       b: "2"
     }, out, __component, "0");
 
-  out.w("<input a=\"3\" b=\"2\">");
+  out.w("<input a=3 b=2>");
 }
 
 marko_template._ = marko_renderer(render, {
diff --git a/packages/marko/test/compiler/fixtures-html/replaceWith/expected.js b/packages/marko/test/compiler/fixtures-html/replaceWith/expected.js
index f05800eb53..c1999d6f96 100644
--- a/packages/marko/test/compiler/fixtures-html/replaceWith/expected.js
+++ b/packages/marko/test/compiler/fixtures-html/replaceWith/expected.js
@@ -7,7 +7,7 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
 function render(input, out, __component, component, state) {
   var data = input;
 
-  out.w("<div replaced=\"test-replaceWith\"></div>");
+  out.w("<div replaced=test-replaceWith></div>");
 }
 
 marko_template._ = marko_renderer(render, {
diff --git a/packages/marko/test/compiler/fixtures-html/style-empty/expected.js b/packages/marko/test/compiler/fixtures-html/style-empty/expected.js
index d5b658a8a6..ad9eb93aca 100644
--- a/packages/marko/test/compiler/fixtures-html/style-empty/expected.js
+++ b/packages/marko/test/compiler/fixtures-html/style-empty/expected.js
@@ -7,7 +7,7 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
 function render(input, out, __component, component, state) {
   var data = input;
 
-  out.w("<div class=\"test\"></div>");
+  out.w("<div class=test></div>");
 }
 
 marko_template._ = marko_renderer(render, {
diff --git a/packages/marko/test/components-compilation/fixtures-html-deprecated/bind-component/expected.js b/packages/marko/test/components-compilation/fixtures-html-deprecated/bind-component/expected.js
index bf6d46b5e3..a5c01d45ae 100644
--- a/packages/marko/test/components-compilation/fixtures-html-deprecated/bind-component/expected.js
+++ b/packages/marko/test/components-compilation/fixtures-html-deprecated/bind-component/expected.js
@@ -12,7 +12,7 @@ function render(input, out, __component, widget, component) {
 
   out.w("<div" +
     marko_dataMarko(null, "@_wbind", __component) +
-    " data-widget=\"/marko-test$1.0.0/components-compilation/fixtures-html-deprecated/bind-component/index\"" +
+    " data-widget=/marko-test$1.0.0/components-compilation/fixtures-html-deprecated/bind-component/index" +
     marko_attr("id", __component.elId()) +
     "></div>");
 }
diff --git a/packages/marko/test/components-compilation/fixtures-html-deprecated/bind-widget/expected.js b/packages/marko/test/components-compilation/fixtures-html-deprecated/bind-widget/expected.js
index 2b0252759a..f5003563fb 100644
--- a/packages/marko/test/components-compilation/fixtures-html-deprecated/bind-widget/expected.js
+++ b/packages/marko/test/components-compilation/fixtures-html-deprecated/bind-widget/expected.js
@@ -11,7 +11,7 @@ function render(input, out, __component, widget, component) {
 
   out.w("<div" +
     marko_dataMarko(null, "@_wbind", __component) +
-    " data-widget=\"/marko-test$1.0.0/components-compilation/fixtures-html-deprecated/bind-widget/widget\"" +
+    " data-widget=/marko-test$1.0.0/components-compilation/fixtures-html-deprecated/bind-widget/widget" +
     marko_attr("id", __component.elId()) +
     "></div>");
 }
diff --git a/packages/marko/test/components-compilation/fixtures-html-deprecated/component-include-attr/expected.js b/packages/marko/test/components-compilation/fixtures-html-deprecated/component-include-attr/expected.js
index 4f7f3bfaa2..2c7d3fe658 100644
--- a/packages/marko/test/components-compilation/fixtures-html-deprecated/component-include-attr/expected.js
+++ b/packages/marko/test/components-compilation/fixtures-html-deprecated/component-include-attr/expected.js
@@ -15,7 +15,7 @@ function render(input, out, __component, widget, component) {
 
   out.w("<div" +
     marko_dataMarko(null, "@_wbind", __component) +
-    " data-widget=\"/marko-test$1.0.0/components-compilation/fixtures-html-deprecated/component-include-attr/index\"" +
+    " data-widget=/marko-test$1.0.0/components-compilation/fixtures-html-deprecated/component-include-attr/index" +
     marko_attr("id", __component.elId()) +
     "><h1>Header</h1><div>");
 
diff --git a/packages/marko/test/components-compilation/fixtures-html-deprecated/component-template-entry/expected.js b/packages/marko/test/components-compilation/fixtures-html-deprecated/component-template-entry/expected.js
index 2124978d69..a571fc290d 100644
--- a/packages/marko/test/components-compilation/fixtures-html-deprecated/component-template-entry/expected.js
+++ b/packages/marko/test/components-compilation/fixtures-html-deprecated/component-template-entry/expected.js
@@ -11,7 +11,7 @@ function render(input, out, __component, widget, component) {
 
   out.w("<div" +
     marko_dataMarko(null, "@_wbind", __component) +
-    " data-widget=\"/marko-test$1.0.0/components-compilation/fixtures-html-deprecated/component-template-entry/component\"" +
+    " data-widget=/marko-test$1.0.0/components-compilation/fixtures-html-deprecated/component-template-entry/component" +
     marko_attr("id", __component.elId()) +
     "></div>");
 }
diff --git a/packages/marko/test/components-compilation/fixtures-html-deprecated/key-colon-attr/expected.js b/packages/marko/test/components-compilation/fixtures-html-deprecated/key-colon-attr/expected.js
index 708dbadf30..fdc336e853 100644
--- a/packages/marko/test/components-compilation/fixtures-html-deprecated/key-colon-attr/expected.js
+++ b/packages/marko/test/components-compilation/fixtures-html-deprecated/key-colon-attr/expected.js
@@ -11,7 +11,7 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
 function render(input, out, __component, component, state) {
   var data = input;
 
-  out.w("<div class=\"root\"><label :scoped=\"name\">Name</label><input" +
+  out.w("<div class=root><label :scoped=name>Name</label><input" +
     marko_attr("id", __component.elId("name")) +
     "></div>");
 }
diff --git a/packages/marko/test/components-compilation/fixtures-html-deprecated/key-suffix/expected.js b/packages/marko/test/components-compilation/fixtures-html-deprecated/key-suffix/expected.js
index 455ff299af..c9568e3205 100644
--- a/packages/marko/test/components-compilation/fixtures-html-deprecated/key-suffix/expected.js
+++ b/packages/marko/test/components-compilation/fixtures-html-deprecated/key-suffix/expected.js
@@ -11,7 +11,7 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
 function render(input, out, __component, component, state) {
   var data = input;
 
-  out.w("<div class=\"root\"><label" +
+  out.w("<div class=root><label" +
     marko_attr("for", __component.elId("name")) +
     ">Name</label><input" +
     marko_attr("id", __component.elId("name")) +
diff --git a/packages/marko/test/components-compilation/fixtures-html/boundary-multi-root-html-el-id-custom-tag-key/expected.js b/packages/marko/test/components-compilation/fixtures-html/boundary-multi-root-html-el-id-custom-tag-key/expected.js
index 0da2e0dbf0..6a567a2c20 100644
--- a/packages/marko/test/components-compilation/fixtures-html/boundary-multi-root-html-el-id-custom-tag-key/expected.js
+++ b/packages/marko/test/components-compilation/fixtures-html/boundary-multi-root-html-el-id-custom-tag-key/expected.js
@@ -12,7 +12,7 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
 function render(input, out, __component, component, state) {
   var data = input;
 
-  out.w("<h1 id=\"myStart\"></h1>");
+  out.w("<h1 id=myStart></h1>");
 
   my_component_tag({}, out, __component, "myEnd");
 }
diff --git a/packages/marko/test/components-compilation/fixtures-html/boundary-multi-root-html-els-ids-static/expected.js b/packages/marko/test/components-compilation/fixtures-html/boundary-multi-root-html-els-ids-static/expected.js
index 90fa7e0813..aa30d30a5e 100644
--- a/packages/marko/test/components-compilation/fixtures-html/boundary-multi-root-html-els-ids-static/expected.js
+++ b/packages/marko/test/components-compilation/fixtures-html/boundary-multi-root-html-els-ids-static/expected.js
@@ -8,7 +8,7 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
 function render(input, out, __component, component, state) {
   var data = input;
 
-  out.w("<h1 id=\"myStart\"></h1><div id=\"myEnd\"></div>");
+  out.w("<h1 id=myStart></h1><div id=myEnd></div>");
 }
 
 marko_template._ = marko_renderer(render, {
diff --git a/packages/marko/test/components-compilation/fixtures-html/boundary-single-root-html-el-static-id/expected.js b/packages/marko/test/components-compilation/fixtures-html/boundary-single-root-html-el-static-id/expected.js
index 0dce4e0f34..eac5a74126 100644
--- a/packages/marko/test/components-compilation/fixtures-html/boundary-single-root-html-el-static-id/expected.js
+++ b/packages/marko/test/components-compilation/fixtures-html/boundary-single-root-html-el-static-id/expected.js
@@ -8,7 +8,7 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
 function render(input, out, __component, component, state) {
   var data = input;
 
-  out.w("<div id=\"foo\"></div>");
+  out.w("<div id=foo></div>");
 }
 
 marko_template._ = marko_renderer(render, {
diff --git a/packages/marko/test/components-compilation/fixtures-html/class-method-empty-return/expected.js b/packages/marko/test/components-compilation/fixtures-html/class-method-empty-return/expected.js
index 5664c0848d..06b3fa50e6 100644
--- a/packages/marko/test/components-compilation/fixtures-html/class-method-empty-return/expected.js
+++ b/packages/marko/test/components-compilation/fixtures-html/class-method-empty-return/expected.js
@@ -12,7 +12,7 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
 function render(input, out, __component, component, state) {
   var data = input;
 
-  out.w("<div class=\"test\"></div>");
+  out.w("<div class=test></div>");
 }
 
 marko_template._ = marko_renderer(render, {
diff --git a/packages/marko/test/components-compilation/fixtures-html/key/expected.js b/packages/marko/test/components-compilation/fixtures-html/key/expected.js
index eb8154f32a..6490ede856 100644
--- a/packages/marko/test/components-compilation/fixtures-html/key/expected.js
+++ b/packages/marko/test/components-compilation/fixtures-html/key/expected.js
@@ -14,11 +14,11 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
 function render(input, out, __component, component, state) {
   var data = input;
 
-  out.w("<div class=\"root\">");
+  out.w("<div class=root>");
 
   app_foo_tag({}, out, __component, "foo");
 
-  out.w("<a href=\"ebay.com\">eBay</a></div>");
+  out.w("<a href=ebay.com>eBay</a></div>");
 }
 
 marko_template._ = marko_renderer(render, {
diff --git a/packages/marko/test/components-compilation/fixtures-html/scoped-suffix/expected.js b/packages/marko/test/components-compilation/fixtures-html/scoped-suffix/expected.js
index 9e01196083..7cb1d901f6 100644
--- a/packages/marko/test/components-compilation/fixtures-html/scoped-suffix/expected.js
+++ b/packages/marko/test/components-compilation/fixtures-html/scoped-suffix/expected.js
@@ -11,7 +11,7 @@ var marko_template = module.exports = require("marko/src/html").t(__filename),
 function render(input, out, __component, component, state) {
   var data = input;
 
-  out.w("<div class=\"root\"><label" +
+  out.w("<div class=root><label" +
     marko_attr("for", __component.elId("name")) +
     ">Name</label><input" +
     marko_attr("id", __component.elId("name")) +
diff --git a/packages/marko/test/hot-reload/fixtures/component-to-template/initial-expected.html b/packages/marko/test/hot-reload/fixtures/component-to-template/initial-expected.html
index 4cf543ef29..47c5fc19ae 100644
--- a/packages/marko/test/hot-reload/fixtures/component-to-template/initial-expected.html
+++ b/packages/marko/test/hot-reload/fixtures/component-to-template/initial-expected.html
@@ -1 +1 @@
-<!--M#s0--><div class="a">Hello Frank</div><!--M/-->
\ No newline at end of file
+<!M#s0><div class=a>Hello Frank</div><!M/>
\ No newline at end of file
diff --git a/packages/marko/test/hot-reload/fixtures/component-to-template/reloaded-expected.html b/packages/marko/test/hot-reload/fixtures/component-to-template/reloaded-expected.html
index 5a71e9579b..09b7337853 100644
--- a/packages/marko/test/hot-reload/fixtures/component-to-template/reloaded-expected.html
+++ b/packages/marko/test/hot-reload/fixtures/component-to-template/reloaded-expected.html
@@ -1 +1 @@
-<div class="b">Hello Jane</div>
\ No newline at end of file
+<div class=b>Hello Jane</div>
\ No newline at end of file
diff --git a/packages/marko/test/hot-reload/fixtures/template-export-component/initial-expected.html b/packages/marko/test/hot-reload/fixtures/template-export-component/initial-expected.html
index 4cf543ef29..47c5fc19ae 100644
--- a/packages/marko/test/hot-reload/fixtures/template-export-component/initial-expected.html
+++ b/packages/marko/test/hot-reload/fixtures/template-export-component/initial-expected.html
@@ -1 +1 @@
-<!--M#s0--><div class="a">Hello Frank</div><!--M/-->
\ No newline at end of file
+<!M#s0><div class=a>Hello Frank</div><!M/>
\ No newline at end of file
diff --git a/packages/marko/test/hot-reload/fixtures/template-export-component/reloaded-expected.html b/packages/marko/test/hot-reload/fixtures/template-export-component/reloaded-expected.html
index 63ae838e9b..705ba3996b 100644
--- a/packages/marko/test/hot-reload/fixtures/template-export-component/reloaded-expected.html
+++ b/packages/marko/test/hot-reload/fixtures/template-export-component/reloaded-expected.html
@@ -1 +1 @@
-<!--M#s0--><div class="b">Hello Frank</div><!--M/-->
\ No newline at end of file
+<!M#s0><div class=b>Hello Frank</div><!M/>
\ No newline at end of file
diff --git a/packages/marko/test/hot-reload/fixtures/template-to-component/initial-expected.html b/packages/marko/test/hot-reload/fixtures/template-to-component/initial-expected.html
index 01481f35af..58638576ef 100644
--- a/packages/marko/test/hot-reload/fixtures/template-to-component/initial-expected.html
+++ b/packages/marko/test/hot-reload/fixtures/template-to-component/initial-expected.html
@@ -1 +1 @@
-<div class="a">Hello Frank</div>
\ No newline at end of file
+<div class=a>Hello Frank</div>
\ No newline at end of file
diff --git a/packages/marko/test/hot-reload/fixtures/template-to-component/reloaded-expected.html b/packages/marko/test/hot-reload/fixtures/template-to-component/reloaded-expected.html
index 4f5101bfbd..87132d7ad3 100644
--- a/packages/marko/test/hot-reload/fixtures/template-to-component/reloaded-expected.html
+++ b/packages/marko/test/hot-reload/fixtures/template-to-component/reloaded-expected.html
@@ -1 +1 @@
-<!--M#s0--><div class="b">Hello Jane</div><!--M/-->
\ No newline at end of file
+<!M#s0><div class=b>Hello Jane</div><!M/>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures-async-deprecated/components-await-beginAsync/expected.html b/packages/marko/test/render/fixtures-async-deprecated/components-await-beginAsync/expected.html
index 5ab91c2bea..e0ea0917e5 100644
--- a/packages/marko/test/render/fixtures-async-deprecated/components-await-beginAsync/expected.html
+++ b/packages/marko/test/render/fixtures-async-deprecated/components-await-beginAsync/expected.html
@@ -1 +1 @@
-<html><body><!--FLUSH--><div class="inner"><div class="inner-inner"><!--M#s0-7--><div>Hello inner-inner</div><!--M/--></div><!--M#s0-8--><div>Hello inner</div><!--M/--></div><!--M#s0-9--><div>Hello outer</div><!--M/--><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-8",0,{"name":"inner"},{"f":1}],["s0-7",0,{"name":"inner-inner"},{"f":1}],["s0-9",0,{"name":"outer"},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures-async-deprecated/components-await-beginAsync/components/hello/index.marko"]})</script></body></html>
\ No newline at end of file
+<html><body><!--FLUSH--><div class=inner><div class=inner-inner><!M#s0-7><div>Hello inner-inner</div><!M/></div><!M#s0-8><div>Hello inner</div><!M/></div><!M#s0-9><div>Hello outer</div><!M/><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-8",0,{"name":"inner"},{"f":1}],["s0-7",0,{"name":"inner-inner"},{"f":1}],["s0-9",0,{"name":"outer"},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures-async-deprecated/components-await-beginAsync/components/hello/index.marko"]})</script></body></html>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures-async-deprecated/components-await-title/expected.html b/packages/marko/test/render/fixtures-async-deprecated/components-await-title/expected.html
index f812d1f2d3..3e0e6dd290 100644
--- a/packages/marko/test/render/fixtures-async-deprecated/components-await-title/expected.html
+++ b/packages/marko/test/render/fixtures-async-deprecated/components-await-title/expected.html
@@ -1 +1 @@
-<html><head><title><!--FLUSH-->Welcome Frank</title></head><body><!--M#s0-0-5-5--><div>Hello</div><!--M/--><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-0-5-5",0,{},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures-async-deprecated/components-await-title/components/hello/index.marko"]})</script></body></html>
\ No newline at end of file
+<html><head><title><!--FLUSH-->Welcome Frank</title></head><body><!M#s0-0-5-5><div>Hello</div><!M/><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-0-5-5",0,{},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures-async-deprecated/components-await-title/components/hello/index.marko"]})</script></body></html>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures-async-deprecated/components-await/expected.html b/packages/marko/test/render/fixtures-async-deprecated/components-await/expected.html
index 3433cf529b..4f19881ea5 100644
--- a/packages/marko/test/render/fixtures-async-deprecated/components-await/expected.html
+++ b/packages/marko/test/render/fixtures-async-deprecated/components-await/expected.html
@@ -1 +1 @@
-<html><body><!--FLUSH--><div class="inner"><!--FLUSH--><div class="inner-inner"><!--M#s0-8--><div>Hello inner-inner</div><!--M/--></div><!--M#s0-9--><div>Hello inner</div><!--M/--></div><!--M#s0-10--><div>Hello outer</div><!--M/--><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-8",0,{"name":"inner-inner"},{"f":1}],["s0-9",0,{"name":"inner"},{"f":1}],["s0-10",0,{"name":"outer"},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures-async-deprecated/components-await/components/hello/index.marko"]})</script></body></html>
\ No newline at end of file
+<html><body><!--FLUSH--><div class=inner><!--FLUSH--><div class=inner-inner><!M#s0-8><div>Hello inner-inner</div><!M/></div><!M#s0-9><div>Hello inner</div><!M/></div><!M#s0-10><div>Hello outer</div><!M/><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-8",0,{"name":"inner-inner"},{"f":1}],["s0-9",0,{"name":"inner"},{"f":1}],["s0-10",0,{"name":"outer"},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures-async-deprecated/components-await/components/hello/index.marko"]})</script></body></html>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures-deprecated/attrs/expected.html b/packages/marko/test/render/fixtures-deprecated/attrs/expected.html
index 10d1596558..5b6a9f059c 100644
--- a/packages/marko/test/render/fixtures-deprecated/attrs/expected.html
+++ b/packages/marko/test/render/fixtures-deprecated/attrs/expected.html
@@ -1 +1 @@
-<div data-encoding="&#34;hello&#34;" style="background-color: #FF0000; <test>" class="my-div" checked>Hello World!</div>
\ No newline at end of file
+<div data-encoding='"hello"' style="background-color: #FF0000; <test>" class=my-div checked>Hello World!</div>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures-deprecated/component-aria-key/expected.html b/packages/marko/test/render/fixtures-deprecated/component-aria-key/expected.html
index 51de1b0c53..ee0c4bb507 100644
--- a/packages/marko/test/render/fixtures-deprecated/component-aria-key/expected.html
+++ b/packages/marko/test/render/fixtures-deprecated/component-aria-key/expected.html
@@ -1 +1 @@
-<!--M#s0--><div id="s0-buttonDescription">Submit the form thing</div><button aria-described-by="s0-buttonDescription">Submit</button><!--M/-->
\ No newline at end of file
+<!M#s0><div id="s0-buttonDescription">Submit the form thing</div><button aria-described-by="s0-buttonDescription">Submit</button><!M/>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures-deprecated/component-elId/expected.html b/packages/marko/test/render/fixtures-deprecated/component-elId/expected.html
index a1a7b912dc..abb68c52a0 100644
--- a/packages/marko/test/render/fixtures-deprecated/component-elId/expected.html
+++ b/packages/marko/test/render/fixtures-deprecated/component-elId/expected.html
@@ -1 +1 @@
-<!--M#s0--><div><input id="s0-checkbox"><label for="s0-checkbox"></label></div><!--M/-->
\ No newline at end of file
+<!M#s0><div><input id="s0-checkbox"><label for="s0-checkbox"></label></div><!M/>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures-deprecated/component-getElId/expected.html b/packages/marko/test/render/fixtures-deprecated/component-getElId/expected.html
index a1a7b912dc..abb68c52a0 100644
--- a/packages/marko/test/render/fixtures-deprecated/component-getElId/expected.html
+++ b/packages/marko/test/render/fixtures-deprecated/component-getElId/expected.html
@@ -1 +1 @@
-<!--M#s0--><div><input id="s0-checkbox"><label for="s0-checkbox"></label></div><!--M/-->
\ No newline at end of file
+<!M#s0><div><input id="s0-checkbox"><label for="s0-checkbox"></label></div><!M/>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/attr-escape-xml/expected.html b/packages/marko/test/render/fixtures/attr-escape-xml/expected.html
index a65d9d1ac1..4f493a15a5 100644
--- a/packages/marko/test/render/fixtures/attr-escape-xml/expected.html
+++ b/packages/marko/test/render/fixtures/attr-escape-xml/expected.html
@@ -1 +1 @@
-<div foo="&#34;hello&#34;" json='{"a":1}'>Hello World!</div>
\ No newline at end of file
+<div foo='"hello"' json='{"a":1}'>Hello World!</div>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/attrs/expected.html b/packages/marko/test/render/fixtures/attrs/expected.html
index 10d1596558..5b6a9f059c 100644
--- a/packages/marko/test/render/fixtures/attrs/expected.html
+++ b/packages/marko/test/render/fixtures/attrs/expected.html
@@ -1 +1 @@
-<div data-encoding="&#34;hello&#34;" style="background-color: #FF0000; <test>" class="my-div" checked>Hello World!</div>
\ No newline at end of file
+<div data-encoding='"hello"' style="background-color: #FF0000; <test>" class=my-div checked>Hello World!</div>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/component-aria-key/expected.html b/packages/marko/test/render/fixtures/component-aria-key/expected.html
index 51de1b0c53..ee0c4bb507 100644
--- a/packages/marko/test/render/fixtures/component-aria-key/expected.html
+++ b/packages/marko/test/render/fixtures/component-aria-key/expected.html
@@ -1 +1 @@
-<!--M#s0--><div id="s0-buttonDescription">Submit the form thing</div><button aria-described-by="s0-buttonDescription">Submit</button><!--M/-->
\ No newline at end of file
+<!M#s0><div id="s0-buttonDescription">Submit the form thing</div><button aria-described-by="s0-buttonDescription">Submit</button><!M/>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/component-file-export-class/expected.html b/packages/marko/test/render/fixtures/component-file-export-class/expected.html
index 99b9886864..4860619b97 100644
--- a/packages/marko/test/render/fixtures/component-file-export-class/expected.html
+++ b/packages/marko/test/render/fixtures/component-file-export-class/expected.html
@@ -1 +1 @@
-<div><!--M#s0-1--><div class="hello">Hello Frank!</div><!--M/--></div>
\ No newline at end of file
+<div><!M#s0-1><div class=hello>Hello Frank!</div><!M/></div>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/component-label-for/expected.html b/packages/marko/test/render/fixtures/component-label-for/expected.html
index 387b7b92ac..6e10fc96aa 100644
--- a/packages/marko/test/render/fixtures/component-label-for/expected.html
+++ b/packages/marko/test/render/fixtures/component-label-for/expected.html
@@ -1 +1 @@
-<!--M#s0--><label for="s0-submitButton">Submit</label><button id="s0-submitButton">Submit</button><!--M/-->
\ No newline at end of file
+<!M#s0><label for="s0-submitButton">Submit</label><button id="s0-submitButton">Submit</button><!M/>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/component-safe-json/expected.html b/packages/marko/test/render/fixtures/component-safe-json/expected.html
index ee13843803..32db92cb34 100644
--- a/packages/marko/test/render/fixtures/component-safe-json/expected.html
+++ b/packages/marko/test/render/fixtures/component-safe-json/expected.html
@@ -1 +1 @@
-<!--M#s0--><!DOCTYPE html><html lang="en"><body>Hello <script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0",0,{"foo-0":"bar\u2028","foo-1":"bar\u2029","foo-2":"\u2028bar\u2029","foo-3":"Hello \u003C/script> \u2028bar\u2029"},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures/component-safe-json/template.marko"]})</script></body></html><!--M/-->
\ No newline at end of file
+<!M#s0><!DOCTYPE html><html lang=en><body>Hello <script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0",0,{"foo-0":"bar\u2028","foo-1":"bar\u2029","foo-2":"\u2028bar\u2029","foo-3":"Hello \u003C/script> \u2028bar\u2029"},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures/component-safe-json/template.marko"]})</script></body></html><!M/>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/components-await-beginAsync/expected.html b/packages/marko/test/render/fixtures/components-await-beginAsync/expected.html
index 2231687891..18ccc5de9d 100644
--- a/packages/marko/test/render/fixtures/components-await-beginAsync/expected.html
+++ b/packages/marko/test/render/fixtures/components-await-beginAsync/expected.html
@@ -1 +1 @@
-<html><body><!--FLUSH--><div class="inner"><div class="inner-inner"><!--M#s0-7--><div>Hello inner-inner</div><!--M/--></div><!--M#s0-8--><div>Hello inner</div><!--M/--></div><!--M#s0-9--><div>Hello outer</div><!--M/--><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-8",0,{"name":"inner"},{"f":1}],["s0-7",0,{"name":"inner-inner"},{"f":1}],["s0-9",0,{"name":"outer"},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures/components-await-beginAsync/components/hello/index.marko"]})</script></body></html>
\ No newline at end of file
+<html><body><!--FLUSH--><div class=inner><div class=inner-inner><!M#s0-7><div>Hello inner-inner</div><!M/></div><!M#s0-8><div>Hello inner</div><!M/></div><!M#s0-9><div>Hello outer</div><!M/><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-8",0,{"name":"inner"},{"f":1}],["s0-7",0,{"name":"inner-inner"},{"f":1}],["s0-9",0,{"name":"outer"},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures/components-await-beginAsync/components/hello/index.marko"]})</script></body></html>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/components-await-title/expected.html b/packages/marko/test/render/fixtures/components-await-title/expected.html
index 93c7ffcd04..626cf8432a 100644
--- a/packages/marko/test/render/fixtures/components-await-title/expected.html
+++ b/packages/marko/test/render/fixtures/components-await-title/expected.html
@@ -1 +1 @@
-<html><head><title><!--FLUSH-->Welcome Frank</title></head><body><!--M#s0-0-5-5--><div>Hello</div><!--M/--><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-0-5-5",0,{},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures/components-await-title/components/hello/index.marko"]})</script></body></html>
\ No newline at end of file
+<html><head><title><!--FLUSH-->Welcome Frank</title></head><body><!M#s0-0-5-5><div>Hello</div><!M/><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-0-5-5",0,{},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures/components-await-title/components/hello/index.marko"]})</script></body></html>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/components-await/expected.html b/packages/marko/test/render/fixtures/components-await/expected.html
index b89cfdc4d0..9021adf5a7 100644
--- a/packages/marko/test/render/fixtures/components-await/expected.html
+++ b/packages/marko/test/render/fixtures/components-await/expected.html
@@ -1 +1 @@
-<html><body><!--FLUSH--><div class="inner"><!--FLUSH--><div class="inner-inner"><!--M#s0-8--><div>Hello inner-inner</div><!--M/--></div><!--M#s0-9--><div>Hello inner</div><!--M/--></div><!--M#s0-10--><div>Hello outer</div><!--M/--><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-8",0,{"name":"inner-inner"},{"f":1}],["s0-9",0,{"name":"inner"},{"f":1}],["s0-10",0,{"name":"outer"},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures/components-await/components/hello/index.marko"]})</script></body></html>
\ No newline at end of file
+<html><body><!--FLUSH--><div class=inner><!--FLUSH--><div class=inner-inner><!M#s0-8><div>Hello inner-inner</div><!M/></div><!M#s0-9><div>Hello inner</div><!M/></div><!M#s0-10><div>Hello outer</div><!M/><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-8",0,{"name":"inner-inner"},{"f":1}],["s0-9",0,{"name":"inner"},{"f":1}],["s0-10",0,{"name":"outer"},{"f":1}]],"t":["/marko-test$1.0.0/render/fixtures/components-await/components/hello/index.marko"]})</script></body></html>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/components/expected.html b/packages/marko/test/render/fixtures/components/expected.html
index 687177b6d1..e8bd7a40ec 100644
--- a/packages/marko/test/render/fixtures/components/expected.html
+++ b/packages/marko/test/render/fixtures/components/expected.html
@@ -1 +1 @@
-<html><head>Components</head><body><!--M#s0-3--><div><h1>foo1</h1><div><h1>bar1</h1></div><div><h1>bar2</h1></div><div><h1>foo-split1</h1><div><h1>split-child1</h1></div><div><h1>split-child2</h1></div></div><div><h1>foo-split2</h1><div><h1>split-child1</h1></div><div><h1>split-child2</h1></div></div></div><!--M/--><!--M#s0-4--><div><h1>foo2</h1><div><h1>bar1</h1></div><div><h1>bar2</h1></div><div><h1>foo-split1</h1><div><h1>split-child1</h1></div><div><h1>split-child2</h1></div></div><div><h1>foo-split2</h1><div><h1>split-child1</h1></div><div><h1>split-child2</h1></div></div></div><!--M/--><!--M#s0-5--><div><h1>split1</h1><!--M^s0-5-split-child1 s0-5 split-child1--><div><h1>split-child1</h1></div><!--M/--><!--M^s0-5-split-child2 s0-5 split-child2--><div><h1>split-child2</h1></div><!--M/--></div><!--M/--><!--M#s0-6--><div><h1>split2</h1><!--M^s0-6-split-child1 s0-6 split-child1--><div><h1>split-child1</h1></div><!--M/--><!--M^s0-6-split-child2 s0-6 split-child2--><div><h1>split-child2</h1></div><!--M/--></div><!--M/--><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-3",0,{"name":"foo1"},{"f":1}],["s0-4",0,{"name":"foo2"},{"f":1}],["s0-5",1,{"name":"split1"}],["s0-5-split-child1",2,{"name":"split-child1"}],["s0-5-split-child2",2,{"name":"split-child2"}],["s0-6",1,{"name":"split2"}],["s0-6-split-child1",2,{"name":"split-child1"}],["s0-6-split-child2",2,{"name":"split-child2"}]],"t":["/marko-test$1.0.0/render/fixtures/components/components/foo/index.marko","/marko-test$1.0.0/render/fixtures/components/components/split/component-browser","/marko-test$1.0.0/render/fixtures/components/components/split/components/split-child/component-browser"]})</script></body></html>
\ No newline at end of file
+<html><head>Components</head><body><!M#s0-3><div><h1>foo1</h1><div><h1>bar1</h1></div><div><h1>bar2</h1></div><div><h1>foo-split1</h1><div><h1>split-child1</h1></div><div><h1>split-child2</h1></div></div><div><h1>foo-split2</h1><div><h1>split-child1</h1></div><div><h1>split-child2</h1></div></div></div><!M/><!M#s0-4><div><h1>foo2</h1><div><h1>bar1</h1></div><div><h1>bar2</h1></div><div><h1>foo-split1</h1><div><h1>split-child1</h1></div><div><h1>split-child2</h1></div></div><div><h1>foo-split2</h1><div><h1>split-child1</h1></div><div><h1>split-child2</h1></div></div></div><!M/><!M#s0-5><div><h1>split1</h1><!M^s0-5-split-child1 s0-5 split-child1><div><h1>split-child1</h1></div><!M/><!M^s0-5-split-child2 s0-5 split-child2><div><h1>split-child2</h1></div><!M/></div><!M/><!M#s0-6><div><h1>split2</h1><!M^s0-6-split-child1 s0-6 split-child1><div><h1>split-child1</h1></div><!M/><!M^s0-6-split-child2 s0-6 split-child2><div><h1>split-child2</h1></div><!M/></div><!M/><script>$MC=(window.$MC||[]).concat({"l":1,"w":[["s0-3",0,{"name":"foo1"},{"f":1}],["s0-4",0,{"name":"foo2"},{"f":1}],["s0-5",1,{"name":"split1"}],["s0-5-split-child1",2,{"name":"split-child1"}],["s0-5-split-child2",2,{"name":"split-child2"}],["s0-6",1,{"name":"split2"}],["s0-6-split-child1",2,{"name":"split-child1"}],["s0-6-split-child2",2,{"name":"split-child2"}]],"t":["/marko-test$1.0.0/render/fixtures/components/components/foo/index.marko","/marko-test$1.0.0/render/fixtures/components/components/split/component-browser","/marko-test$1.0.0/render/fixtures/components/components/split/components/split-child/component-browser"]})</script></body></html>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/dynamic-split-component/expected.html b/packages/marko/test/render/fixtures/dynamic-split-component/expected.html
index 4f0d4972be..0d6f5401ac 100644
--- a/packages/marko/test/render/fixtures/dynamic-split-component/expected.html
+++ b/packages/marko/test/render/fixtures/dynamic-split-component/expected.html
@@ -1 +1 @@
-<!--M#s0-0--><div data-marko-key="@test s0-0">Body data</div><!--M/--><!--M#s0-1--><div>Body data</div><!--M/--><!--M#s0-2--><div data-marko-key="@test s0-2"></div><!--M/--><!--M#s0-3--><div></div><!--M/-->
\ No newline at end of file
+<!M#s0-0><div data-marko-key="@test s0-0">Body data</div><!M/><!M#s0-1><div>Body data</div><!M/><!M#s0-2><div data-marko-key="@test s0-2"></div><!M/><!M#s0-3><div></div><!M/>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/dynamic-tag-arguments/expected.html b/packages/marko/test/render/fixtures/dynamic-tag-arguments/expected.html
index 659175d654..b15e3c9e71 100644
--- a/packages/marko/test/render/fixtures/dynamic-tag-arguments/expected.html
+++ b/packages/marko/test/render/fixtures/dynamic-tag-arguments/expected.html
@@ -1 +1 @@
-<!--M#s0--><!--F#0-->testPage http://ebay.com<div style="color:green"></div><!--F/--><!--M/-->
\ No newline at end of file
+<!M#s0><!F#0>testPage http://ebay.com<div style="color:green"></div><!F/><!M/>
\ No newline at end of file
diff --git a/packages/marko/test/render/fixtures/global-runtime-id/expected.html b/packages/marko/test/render/fixtures/global-runtime-id/expected.html
index 7e37ecba4f..895936a288 100644
--- a/packages/marko/test/render/fixtures/global-runtime-id/expected.html
+++ b/packages/marko/test/render/fixtures/global-runtime-id/expected.html
@@ -1 +1 @@
-<!--FOO#s0--><div></div><!--FOO/-->
\ No newline at end of file
+<!FOO#s0><div></div><!FOO/>
\ No newline at end of file