From f321384e66551ea130224c5bbd70f7939b47f598 Mon Sep 17 00:00:00 2001
From: Joe Davidson <joe.davidson.21111@gmail.com>
Date: Fri, 23 Jun 2023 10:04:11 +0100
Subject: [PATCH] feat: improve rendering performance by combining sequential
 string constant writes, fixes #96

---
 benchmarks/templ/template_templ.go            | 112 +---
 cmd/templ/lspcmd/httpdebug/list_templ.go      | 200 +-----
 .../visualize/sourcemapvisualisation_templ.go | 163 +----
 examples/blog/posts_templ.go                  | 242 +------
 examples/counter-basic/components_templ.go    | 428 +------------
 .../counter/components/components_templ.go    | 588 +-----------------
 examples/hello-world-ssr/hello_templ.go       |   3 -
 examples/hello-world-static/hello_templ.go    |   3 -
 examples/static-generator/blog_templ.go       |  99 +--
 .../components/templsyntax_templ.go           |   4 -
 generator/generator.go                        | 146 +----
 generator/generator_test.go                   |   4 +-
 generator/rangewriter.go                      |  69 +-
 generator/test-a-href/template_templ.go       |  59 +-
 .../test-attribute-escaping/template_templ.go |  30 +-
 generator/test-call/template_templ.go         |  73 +--
 .../test-complex-attributes/template_templ.go | 130 +---
 generator/test-css-usage/template_templ.go    | 121 +---
 generator/test-doctype/template_templ.go      |  96 +--
 .../test-element-attributes/template_templ.go |  59 +-
 generator/test-elseif/template_templ.go       |  27 +-
 generator/test-for/template_templ.go          |   3 -
 generator/test-html/template_templ.go         | 112 +---
 generator/test-if/template_templ.go           |   3 -
 generator/test-ifelse/template_templ.go       |   3 -
 generator/test-import/template_templ.go       |  20 +-
 generator/test-raw-elements/template_templ.go |  66 +-
 generator/test-script-usage/template_templ.go |  53 +-
 generator/test-string/template_templ.go       |  24 +-
 generator/test-switch/template_templ.go       |   5 +-
 .../test-switchdefault/template_templ.go      |   5 +-
 .../test-templ-element/template_templ.go      |  36 +-
 .../test-text-whitespace/template_templ.go    |  40 +-
 generator/test-text/template_templ.go         |  28 +-
 generator/test-void/template_templ.go         |  27 +-
 storybook/_example/templates_templ.go         |  50 +-
 turbo/stream_templ.go                         |  72 +--
 37 files changed, 258 insertions(+), 2945 deletions(-)

diff --git a/benchmarks/templ/template_templ.go b/benchmarks/templ/template_templ.go
index 24caa45c8..59fc87995 100644
--- a/benchmarks/templ/template_templ.go
+++ b/benchmarks/templ/template_templ.go
@@ -22,45 +22,16 @@ func Render(p Person) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
+		_, err = templBuffer.WriteString("<div><h1>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1>")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_2 string = p.Name
 		_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</h1>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" style=\"font-family: &#39;sans-serif&#39;\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" id=\"test\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" data-contents=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("</h1><div style=\"font-family: &#39;sans-serif&#39;\" id=\"test\" data-contents=\"")
 		if err != nil {
 			return err
 		}
@@ -68,36 +39,16 @@ func Render(p Person) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("\"><div>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_3 := `email:`
 		_, err = templBuffer.WriteString(var_3)
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<a")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" href=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<a href=\"")
 		if err != nil {
 			return err
 		}
@@ -106,59 +57,26 @@ func Render(p Person) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_5 string = p.Email
 		_, err = templBuffer.WriteString(templ.EscapeString(var_5))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</a>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<hr")
+		_, err = templBuffer.WriteString("</a></div></div></div><hr")
 		if err != nil {
 			return err
 		}
-		// Element Attributes
 		if true {
 			_, err = templBuffer.WriteString(" noshade")
 			if err != nil {
 				return err
 			}
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<hr")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" optionA")
+		_, err = templBuffer.WriteString("><hr optionA")
 		if err != nil {
 			return err
 		}
@@ -178,21 +96,7 @@ func Render(p Person) templ.Component {
 				return err
 			}
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<hr")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" noshade")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("><hr noshade>")
 		if err != nil {
 			return err
 		}
diff --git a/cmd/templ/lspcmd/httpdebug/list_templ.go b/cmd/templ/lspcmd/httpdebug/list_templ.go
index 6376f6d5b..804dbe863 100644
--- a/cmd/templ/lspcmd/httpdebug/list_templ.go
+++ b/cmd/templ/lspcmd/httpdebug/list_templ.go
@@ -22,109 +22,30 @@ func list(uris []string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<table>")
+		_, err = templBuffer.WriteString("<table><tr><th>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<tr>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<th>")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_2 := `File`
 		_, err = templBuffer.WriteString(var_2)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</th>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<th>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</th>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<th>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</th>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<th>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</th>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<th>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</th>")
+		_, err = templBuffer.WriteString("</th><th></th><th></th><th></th><th></th></tr>")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</tr>")
-		if err != nil {
-			return err
-		}
-		// For
 		for _, uri := range uris {
-			// Element (standard)
-			_, err = templBuffer.WriteString("<tr>")
-			if err != nil {
-				return err
-			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<td>")
+			_, err = templBuffer.WriteString("<tr><td>")
 			if err != nil {
 				return err
 			}
-			// StringExpression
 			var var_3 string = uri
 			_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("</td>")
-			if err != nil {
-				return err
-			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<td>")
-			if err != nil {
-				return err
-			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<a")
-			if err != nil {
-				return err
-			}
-			// Element Attributes
-			_, err = templBuffer.WriteString(" href=")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("\"")
+			_, err = templBuffer.WriteString("</td><td><a href=\"")
 			if err != nil {
 				return err
 			}
@@ -133,44 +54,16 @@ func list(uris []string) templ.Component {
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("\"")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString(">")
+			_, err = templBuffer.WriteString("\">")
 			if err != nil {
 				return err
 			}
-			// Text
 			var_5 := `Mapping`
 			_, err = templBuffer.WriteString(var_5)
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("</a>")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("</td>")
-			if err != nil {
-				return err
-			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<td>")
-			if err != nil {
-				return err
-			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<a")
-			if err != nil {
-				return err
-			}
-			// Element Attributes
-			_, err = templBuffer.WriteString(" href=")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("\"")
+			_, err = templBuffer.WriteString("</a></td><td><a href=\"")
 			if err != nil {
 				return err
 			}
@@ -179,44 +72,16 @@ func list(uris []string) templ.Component {
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("\"")
+			_, err = templBuffer.WriteString("\">")
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString(">")
-			if err != nil {
-				return err
-			}
-			// Text
 			var_7 := `Source Map`
 			_, err = templBuffer.WriteString(var_7)
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("</a>")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("</td>")
-			if err != nil {
-				return err
-			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<td>")
-			if err != nil {
-				return err
-			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<a")
-			if err != nil {
-				return err
-			}
-			// Element Attributes
-			_, err = templBuffer.WriteString(" href=")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("\"")
+			_, err = templBuffer.WriteString("</a></td><td><a href=\"")
 			if err != nil {
 				return err
 			}
@@ -225,44 +90,16 @@ func list(uris []string) templ.Component {
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("\"")
+			_, err = templBuffer.WriteString("\">")
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString(">")
-			if err != nil {
-				return err
-			}
-			// Text
 			var_9 := `Templ`
 			_, err = templBuffer.WriteString(var_9)
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("</a>")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("</td>")
-			if err != nil {
-				return err
-			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<td>")
-			if err != nil {
-				return err
-			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<a")
-			if err != nil {
-				return err
-			}
-			// Element Attributes
-			_, err = templBuffer.WriteString(" href=")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("\"")
+			_, err = templBuffer.WriteString("</a></td><td><a href=\"")
 			if err != nil {
 				return err
 			}
@@ -271,29 +108,16 @@ func list(uris []string) templ.Component {
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("\"")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString(">")
+			_, err = templBuffer.WriteString("\">")
 			if err != nil {
 				return err
 			}
-			// Text
 			var_11 := `Go`
 			_, err = templBuffer.WriteString(var_11)
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("</a>")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("</td>")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("</tr>")
+			_, err = templBuffer.WriteString("</a></td></tr>")
 			if err != nil {
 				return err
 			}
diff --git a/cmd/templ/visualize/sourcemapvisualisation_templ.go b/cmd/templ/visualize/sourcemapvisualisation_templ.go
index 52895beb1..7179bc260 100644
--- a/cmd/templ/visualize/sourcemapvisualisation_templ.go
+++ b/cmd/templ/visualize/sourcemapvisualisation_templ.go
@@ -55,52 +55,24 @@ func combine(templFileName string, left, right templ.Component) templ.Component
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<html>")
+		_, err = templBuffer.WriteString("<html><head><title>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<head>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<title>")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_2 string = templFileName
 		_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 		if err != nil {
 			return err
 		}
-		// Text
 		var_3 := `- Source Map Visualisation`
 		_, err = templBuffer.WriteString(var_3)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</title>")
+		_, err = templBuffer.WriteString("</title><style type=\"text/css\">")
 		if err != nil {
 			return err
 		}
-		// RawElement
-		_, err = templBuffer.WriteString("<style")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" type=\"text/css\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_4 := `
 				.mapped { background-color: green }
 				.highlighted { background-color: yellow }
@@ -109,25 +81,10 @@ func combine(templFileName string, left, right templ.Component) templ.Component
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</style>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</head>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<body>")
+		_, err = templBuffer.WriteString("</style></head><body><h1>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1>")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_5 string = templFileName
 		_, err = templBuffer.WriteString(templ.EscapeString(var_5))
 		if err != nil {
@@ -137,23 +94,12 @@ func combine(templFileName string, left, right templ.Component) templ.Component
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		// Element CSS
 		var var_6 = []any{templ.Classes(row())}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_6...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<div class=\"")
 		if err != nil {
 			return err
 		}
@@ -161,31 +107,16 @@ func combine(templFileName string, left, right templ.Component) templ.Component
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		// Element CSS
 		var var_7 = []any{templ.Classes(column(), code())}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_7...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<div class=\"")
 		if err != nil {
 			return err
 		}
@@ -193,15 +124,10 @@ func combine(templFileName string, left, right templ.Component) templ.Component
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("\">")
 		if err != nil {
 			return err
 		}
-		// CallTemplate
 		err = left.Render(ctx, templBuffer)
 		if err != nil {
 			return err
@@ -210,23 +136,12 @@ func combine(templFileName string, left, right templ.Component) templ.Component
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		// Element CSS
 		var var_8 = []any{templ.Classes(column(), code())}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_8...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<div class=\"")
 		if err != nil {
 			return err
 		}
@@ -234,32 +149,15 @@ func combine(templFileName string, left, right templ.Component) templ.Component
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// CallTemplate
 		err = right.Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</body>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</html>")
+		_, err = templBuffer.WriteString("</div></div></body></html>")
 		if err != nil {
 			return err
 		}
@@ -313,28 +211,16 @@ func mappedCharacter(s string, sourceID, targetID string) templ.Component {
 			var_9 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		// Element CSS
 		var var_10 = []any{templ.Classes(templ.Class("mapped"), templ.Class(sourceID), templ.Class(targetID))}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_10...)
 		if err != nil {
 			return err
 		}
-		// Element Script
 		err = templ.RenderScriptItems(ctx, templBuffer, highlight(sourceID, targetID), removeHighlight(sourceID, targetID))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<span")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<span class=\"")
 		if err != nil {
 			return err
 		}
@@ -342,15 +228,7 @@ func mappedCharacter(s string, sourceID, targetID string) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" onMouseOver=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\" onMouseOver=\"")
 		if err != nil {
 			return err
 		}
@@ -359,15 +237,7 @@ func mappedCharacter(s string, sourceID, targetID string) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" onMouseOut=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\" onMouseOut=\"")
 		if err != nil {
 			return err
 		}
@@ -376,15 +246,10 @@ func mappedCharacter(s string, sourceID, targetID string) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("\">")
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_13 string = s
 		_, err = templBuffer.WriteString(templ.EscapeString(var_13))
 		if err != nil {
diff --git a/examples/blog/posts_templ.go b/examples/blog/posts_templ.go
index b3a1ada1b..6afafbac3 100644
--- a/examples/blog/posts_templ.go
+++ b/examples/blog/posts_templ.go
@@ -9,7 +9,6 @@ import "context"
 import "io"
 import "bytes"
 
-// GoExpression
 import "fmt"
 import "time"
 
@@ -26,36 +25,16 @@ func headerTemplate(name string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<header")
+		_, err = templBuffer.WriteString("<header data-testid=\"headerTemplate\"><h1>")
 		if err != nil {
 			return err
 		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" data-testid=\"headerTemplate\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1>")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_2 string = name
 		_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</h1>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</header>")
+		_, err = templBuffer.WriteString("</h1></header>")
 		if err != nil {
 			return err
 		}
@@ -79,42 +58,21 @@ func footerTemplate() templ.Component {
 			var_3 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<footer")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" data-testid=\"footerTemplate\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
+		_, err = templBuffer.WriteString("<footer data-testid=\"footerTemplate\"><div>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_4 := `&copy; `
 		_, err = templBuffer.WriteString(var_4)
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_5 string = fmt.Sprintf("%d", time.Now().Year())
 		_, err = templBuffer.WriteString(templ.EscapeString(var_5))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</footer>")
+		_, err = templBuffer.WriteString("</div></footer>")
 		if err != nil {
 			return err
 		}
@@ -138,96 +96,25 @@ func navTemplate() templ.Component {
 			var_6 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<nav")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" data-testid=\"navTemplate\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<ul>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<li>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<a")
+		_, err = templBuffer.WriteString("<nav data-testid=\"navTemplate\"><ul><li><a href=\"/\">")
 		if err != nil {
 			return err
 		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" href=\"/\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_7 := `Home`
 		_, err = templBuffer.WriteString(var_7)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</a>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</li>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<li>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<a")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" href=\"/posts\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("</a></li><li><a href=\"/posts\">")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_8 := `Posts`
 		_, err = templBuffer.WriteString(var_8)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</a>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</li>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</ul>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</nav>")
+		_, err = templBuffer.WriteString("</a></li></ul></nav>")
 		if err != nil {
 			return err
 		}
@@ -251,69 +138,39 @@ func layout(name string) templ.Component {
 			var_9 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<html>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<head>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<title>")
+		_, err = templBuffer.WriteString("<html><head><title>")
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_10 string = name
 		_, err = templBuffer.WriteString(templ.EscapeString(var_10))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</title>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</head>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<body>")
+		_, err = templBuffer.WriteString("</title></head><body>")
 		if err != nil {
 			return err
 		}
-		// TemplElement
 		err = headerTemplate(name).Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		// TemplElement
 		err = navTemplate().Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		// Element (standard)
 		_, err = templBuffer.WriteString("<main>")
 		if err != nil {
 			return err
 		}
-		// Children
 		err = var_9.Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</main>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</body>")
+		_, err = templBuffer.WriteString("</main></body>")
 		if err != nil {
 			return err
 		}
-		// TemplElement
 		err = footerTemplate().Render(ctx, templBuffer)
 		if err != nil {
 			return err
@@ -342,85 +199,30 @@ func postsTemplate(posts []Post) templ.Component {
 			var_11 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" data-testid=\"postsTemplate\"")
+		_, err = templBuffer.WriteString("<div data-testid=\"postsTemplate\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// For
 		for _, p := range posts {
-			// Element (standard)
-			_, err = templBuffer.WriteString("<div")
-			if err != nil {
-				return err
-			}
-			// Element Attributes
-			_, err = templBuffer.WriteString(" data-testid=\"postsTemplatePost\"")
+			_, err = templBuffer.WriteString("<div data-testid=\"postsTemplatePost\"><div data-testid=\"postsTemplatePostName\">")
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString(">")
-			if err != nil {
-				return err
-			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<div")
-			if err != nil {
-				return err
-			}
-			// Element Attributes
-			_, err = templBuffer.WriteString(" data-testid=\"postsTemplatePostName\"")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString(">")
-			if err != nil {
-				return err
-			}
-			// StringExpression
 			var var_12 string = p.Name
 			_, err = templBuffer.WriteString(templ.EscapeString(var_12))
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("</div>")
-			if err != nil {
-				return err
-			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<div")
+			_, err = templBuffer.WriteString("</div><div data-testid=\"postsTemplatePostAuthor\">")
 			if err != nil {
 				return err
 			}
-			// Element Attributes
-			_, err = templBuffer.WriteString(" data-testid=\"postsTemplatePostAuthor\"")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString(">")
-			if err != nil {
-				return err
-			}
-			// StringExpression
 			var var_13 string = p.Author
 			_, err = templBuffer.WriteString(templ.EscapeString(var_13))
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("</div>")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("</div>")
+			_, err = templBuffer.WriteString("</div></div>")
 			if err != nil {
 				return err
 			}
@@ -449,28 +251,16 @@ func home() templ.Component {
 			var_14 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// TemplElement
 		var_15 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
 			templBuffer, templIsBuffer := w.(*bytes.Buffer)
 			if !templIsBuffer {
 				templBuffer = templ.GetBuffer()
 				defer templ.ReleaseBuffer(templBuffer)
 			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<div")
-			if err != nil {
-				return err
-			}
-			// Element Attributes
-			_, err = templBuffer.WriteString(" data-testid=\"homeTemplate\"")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString(">")
+			_, err = templBuffer.WriteString("<div data-testid=\"homeTemplate\">")
 			if err != nil {
 				return err
 			}
-			// Text
 			var_16 := `Welcome to my website.`
 			_, err = templBuffer.WriteString(var_16)
 			if err != nil {
@@ -509,14 +299,12 @@ func posts(posts []Post) templ.Component {
 			var_17 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// TemplElement
 		var_18 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
 			templBuffer, templIsBuffer := w.(*bytes.Buffer)
 			if !templIsBuffer {
 				templBuffer = templ.GetBuffer()
 				defer templ.ReleaseBuffer(templBuffer)
 			}
-			// TemplElement
 			err = postsTemplate(posts).Render(ctx, templBuffer)
 			if err != nil {
 				return err
diff --git a/examples/counter-basic/components_templ.go b/examples/counter-basic/components_templ.go
index 4f80f8723..ec074f562 100644
--- a/examples/counter-basic/components_templ.go
+++ b/examples/counter-basic/components_templ.go
@@ -9,7 +9,6 @@ import "context"
 import "io"
 import "bytes"
 
-// GoExpression
 import "strconv"
 
 func counts(global, user int) templ.Component {
@@ -25,39 +24,29 @@ func counts(global, user int) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<div>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_2 := `Global: `
 		_, err = templBuffer.WriteString(var_2)
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_3 string = strconv.Itoa(global)
 		_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
+		_, err = templBuffer.WriteString("</div><div>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_4 := `User: `
 		_, err = templBuffer.WriteString(var_4)
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_5 string = strconv.Itoa(user)
 		_, err = templBuffer.WriteString(templ.EscapeString(var_5))
 		if err != nil {
@@ -87,107 +76,25 @@ func form() templ.Component {
 			var_6 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<form")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" action=\"/\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" method=\"POST\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
+		_, err = templBuffer.WriteString("<form action=\"/\" method=\"POST\"><div><button type=\"submit\" name=\"global\" value=\"global\">")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<button")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" type=\"submit\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" name=\"global\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" value=\"global\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_7 := `Global`
 		_, err = templBuffer.WriteString(var_7)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</button>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<button")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" type=\"submit\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" name=\"user\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" value=\"user\"")
+		_, err = templBuffer.WriteString("</button></div><div><button type=\"submit\" name=\"user\" value=\"user\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_8 := `User`
 		_, err = templBuffer.WriteString(var_8)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</button>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</form>")
+		_, err = templBuffer.WriteString("</button></div></form>")
 		if err != nil {
 			return err
 		}
@@ -211,356 +118,37 @@ func page(global, user int) templ.Component {
 			var_9 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<html>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<head>")
+		_, err = templBuffer.WriteString("<html><head><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><title>")
 		if err != nil {
 			return err
 		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<meta")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" charset=\"UTF-8\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<meta")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" name=\"viewport\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" content=\"width=device-width, initial-scale=1.0\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<title>")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_10 := `Counts`
 		_, err = templBuffer.WriteString(var_10)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</title>")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<link")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" rel=\"stylesheet\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" href=\"/assets/bulma.min.css\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<link")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" rel=\"apple-touch-icon\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" sizes=\"180x180\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" href=\"/assets/favicon/apple-touch-icon.png\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<link")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" rel=\"icon\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" type=\"image/png\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" sizes=\"32x32\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" href=\"/assets/favicon/favicon-32x32.png\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<link")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" rel=\"icon\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" type=\"image/png\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" sizes=\"16x16\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" href=\"/assets/favicon/favicon-16x16.png\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<link")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" rel=\"manifest\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" href=\"/assets/favicon/site.webmanifest\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</head>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<body")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"bg-gray-100\"")
+		_, err = templBuffer.WriteString("</title><link rel=\"stylesheet\" href=\"/assets/bulma.min.css\"><link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"/assets/favicon/apple-touch-icon.png\"><link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"/assets/favicon/favicon-32x32.png\"><link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"/assets/favicon/favicon-16x16.png\"><link rel=\"manifest\" href=\"/assets/favicon/site.webmanifest\"></head><body class=\"bg-gray-100\"><header class=\"hero is-primary\"><div class=\"hero-body\"><div class=\"container\"><h1 class=\"title\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<header")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"hero is-primary\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"hero-body\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"container\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"title\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_11 := `Counts`
 		_, err = templBuffer.WriteString(var_11)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</h1>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</header>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<section")
+		_, err = templBuffer.WriteString("</h1></div></div></header><section class=\"section\"><div class=\"container\"><div class=\"columns is-centered\"><div class=\"column is-half\">")
 		if err != nil {
 			return err
 		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"section\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"container\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"columns is-centered\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"column is-half\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// TemplElement
 		err = counts(global, user).Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		// TemplElement
 		err = form().Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</section>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</body>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</html>")
+		_, err = templBuffer.WriteString("</div></div></div></section></body></html>")
 		if err != nil {
 			return err
 		}
diff --git a/examples/counter/components/components_templ.go b/examples/counter/components/components_templ.go
index ac59f0fa8..fcaa20b8c 100644
--- a/examples/counter/components/components_templ.go
+++ b/examples/counter/components/components_templ.go
@@ -10,7 +10,6 @@ import "io"
 import "bytes"
 import "strings"
 
-// GoExpression
 import "strconv"
 
 func border() templ.CSSClass {
@@ -40,71 +39,16 @@ func counts(global, session int) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<form")
+		_, err = templBuffer.WriteString("<form id=\"countsForm\" action=\"/\" method=\"POST\" hx-post=\"/\" hx-select=\"#countsForm\" hx-swap=\"outerHTML\"><div class=\"columns\">")
 		if err != nil {
 			return err
 		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" id=\"countsForm\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" action=\"/\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" method=\"POST\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" hx-post=\"/\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" hx-select=\"#countsForm\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" hx-swap=\"outerHTML\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"columns\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		// Element CSS
 		var var_2 = []any{"column", "has-text-centered", "is-primary", border}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_2...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<div class=\"")
 		if err != nil {
 			return err
 		}
@@ -112,128 +56,43 @@ func counts(global, session int) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("\"><h1 class=\"title is-size-1 has-text-centered\">")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"title is-size-1 has-text-centered\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_3 string = strconv.Itoa(global)
 		_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</h1>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<p")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"subtitle has-text-centered\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("</h1><p class=\"subtitle has-text-centered\">")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_4 := `Global`
 		_, err = templBuffer.WriteString(var_4)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</p>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<button")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"button is-primary\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" type=\"submit\"")
+		_, err = templBuffer.WriteString("</p><div><button class=\"button is-primary\" type=\"submit\" name=\"global\" value=\"global\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(" name=\"global\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" value=\"global\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_5 := `+1`
 		_, err = templBuffer.WriteString(var_5)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</button>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
+		_, err = templBuffer.WriteString("</button></div></div>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		// Element CSS
 		var var_6 = []any{"column", "has-text-centered", border}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_6...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<div class=\"")
 		if err != nil {
 			return err
 		}
@@ -241,116 +100,34 @@ func counts(global, session int) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"title is-size-1 has-text-centered\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("\"><h1 class=\"title is-size-1 has-text-centered\">")
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_7 string = strconv.Itoa(session)
 		_, err = templBuffer.WriteString(templ.EscapeString(var_7))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</h1>")
+		_, err = templBuffer.WriteString("</h1><p class=\"subtitle has-text-centered\">")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<p")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"subtitle has-text-centered\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_8 := `Session`
 		_, err = templBuffer.WriteString(var_8)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</p>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
+		_, err = templBuffer.WriteString("</p><div><button class=\"button is-secondary\" type=\"submit\" name=\"session\" value=\"session\">")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<button")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"button is-secondary\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" type=\"submit\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" name=\"session\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" value=\"session\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_9 := `+1`
 		_, err = templBuffer.WriteString(var_9)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</button>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</form>")
+		_, err = templBuffer.WriteString("</button></div></div></div></form>")
 		if err != nil {
 			return err
 		}
@@ -374,375 +151,42 @@ func Page(global, session int) templ.Component {
 			var_10 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<html>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<head>")
+		_, err = templBuffer.WriteString("<html><head><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><title>")
 		if err != nil {
 			return err
 		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<meta")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" charset=\"UTF-8\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<meta")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" name=\"viewport\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" content=\"width=device-width, initial-scale=1.0\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<title>")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_11 := `Counts`
 		_, err = templBuffer.WriteString(var_11)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</title>")
+		_, err = templBuffer.WriteString("</title><link rel=\"stylesheet\" href=\"/assets/css/bulma.min.css\"><link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"/assets/favicon/apple-touch-icon.png\"><link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"/assets/favicon/favicon-32x32.png\"><link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"/assets/favicon/favicon-16x16.png\"><link rel=\"manifest\" href=\"/assets/favicon/site.webmanifest\"><script src=\"/assets/js/htmx.min.js\">")
 		if err != nil {
 			return err
 		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<link")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" rel=\"stylesheet\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" href=\"/assets/css/bulma.min.css\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<link")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" rel=\"apple-touch-icon\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" sizes=\"180x180\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" href=\"/assets/favicon/apple-touch-icon.png\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<link")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" rel=\"icon\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" type=\"image/png\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" sizes=\"32x32\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" href=\"/assets/favicon/favicon-32x32.png\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<link")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" rel=\"icon\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" type=\"image/png\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" sizes=\"16x16\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" href=\"/assets/favicon/favicon-16x16.png\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<link")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" rel=\"manifest\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" href=\"/assets/favicon/site.webmanifest\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// RawElement
-		_, err = templBuffer.WriteString("<script")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" src=\"/assets/js/htmx.min.js\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_12 := ``
 		_, err = templBuffer.WriteString(var_12)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</script>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</head>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<body")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"bg-gray-100\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<header")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"hero is-primary\"")
+		_, err = templBuffer.WriteString("</script></head><body class=\"bg-gray-100\"><header class=\"hero is-primary\"><div class=\"hero-body\"><div class=\"container\"><h1 class=\"title\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"hero-body\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"container\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"title\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_13 := `Counts`
 		_, err = templBuffer.WriteString(var_13)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</h1>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</header>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<section")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"section\"")
+		_, err = templBuffer.WriteString("</h1></div></div></header><section class=\"section\"><div class=\"container\"><div class=\"columns is-centered\"><div class=\"column is-half\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"container\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"columns is-centered\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"column is-half\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// TemplElement
 		err = counts(global, session).Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</section>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</body>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</html>")
+		_, err = templBuffer.WriteString("</div></div></div></section></body></html>")
 		if err != nil {
 			return err
 		}
diff --git a/examples/hello-world-ssr/hello_templ.go b/examples/hello-world-ssr/hello_templ.go
index 0870d3261..ab4f1fab2 100644
--- a/examples/hello-world-ssr/hello_templ.go
+++ b/examples/hello-world-ssr/hello_templ.go
@@ -22,18 +22,15 @@ func hello(name string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<div>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_2 := `Hello, `
 		_, err = templBuffer.WriteString(var_2)
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_3 string = name
 		_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 		if err != nil {
diff --git a/examples/hello-world-static/hello_templ.go b/examples/hello-world-static/hello_templ.go
index 0870d3261..ab4f1fab2 100644
--- a/examples/hello-world-static/hello_templ.go
+++ b/examples/hello-world-static/hello_templ.go
@@ -22,18 +22,15 @@ func hello(name string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<div>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_2 := `Hello, `
 		_, err = templBuffer.WriteString(var_2)
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_3 string = name
 		_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 		if err != nil {
diff --git a/examples/static-generator/blog_templ.go b/examples/static-generator/blog_templ.go
index c6bb75a9a..8dfe202d1 100644
--- a/examples/static-generator/blog_templ.go
+++ b/examples/static-generator/blog_templ.go
@@ -9,7 +9,6 @@ import "context"
 import "io"
 import "bytes"
 
-// GoExpression
 import "path"
 import "github.com/gosimple/slug"
 
@@ -26,27 +25,16 @@ func headerComponent(title string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<head>")
+		_, err = templBuffer.WriteString("<head><title>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<title>")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_2 string = title
 		_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</title>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</head>")
+		_, err = templBuffer.WriteString("</title></head>")
 		if err != nil {
 			return err
 		}
@@ -70,50 +58,24 @@ func contentComponent(title string, body templ.Component) templ.Component {
 			var_3 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<body>")
+		_, err = templBuffer.WriteString("<body><h1>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1>")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_4 string = title
 		_, err = templBuffer.WriteString(templ.EscapeString(var_4))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</h1>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=\"content\"")
+		_, err = templBuffer.WriteString("</h1><div class=\"content\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// CallTemplate
 		err = body.Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</body>")
+		_, err = templBuffer.WriteString("</div></body>")
 		if err != nil {
 			return err
 		}
@@ -137,17 +99,14 @@ func contentPage(title string, body templ.Component) templ.Component {
 			var_5 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<html>")
 		if err != nil {
 			return err
 		}
-		// TemplElement
 		err = headerComponent(title).Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		// TemplElement
 		err = contentComponent(title, body).Render(ctx, templBuffer)
 		if err != nil {
 			return err
@@ -176,27 +135,18 @@ func indexPage(posts []Post) templ.Component {
 			var_6 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<html>")
 		if err != nil {
 			return err
 		}
-		// TemplElement
 		err = headerComponent("My Blog").Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<body>")
+		_, err = templBuffer.WriteString("<body><h1>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1>")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_7 := `My Blog`
 		_, err = templBuffer.WriteString(var_7)
 		if err != nil {
@@ -206,24 +156,8 @@ func indexPage(posts []Post) templ.Component {
 		if err != nil {
 			return err
 		}
-		// For
 		for _, post := range posts {
-			// Element (standard)
-			_, err = templBuffer.WriteString("<div>")
-			if err != nil {
-				return err
-			}
-			// Element (standard)
-			_, err = templBuffer.WriteString("<a")
-			if err != nil {
-				return err
-			}
-			// Element Attributes
-			_, err = templBuffer.WriteString(" href=")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("\"")
+			_, err = templBuffer.WriteString("<div><a href=\"")
 			if err != nil {
 				return err
 			}
@@ -232,34 +166,21 @@ func indexPage(posts []Post) templ.Component {
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("\"")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString(">")
+			_, err = templBuffer.WriteString("\">")
 			if err != nil {
 				return err
 			}
-			// StringExpression
 			var var_9 string = post.Title
 			_, err = templBuffer.WriteString(templ.EscapeString(var_9))
 			if err != nil {
 				return err
 			}
-			_, err = templBuffer.WriteString("</a>")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("</div>")
+			_, err = templBuffer.WriteString("</a></div>")
 			if err != nil {
 				return err
 			}
 		}
-		_, err = templBuffer.WriteString("</body>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</html>")
+		_, err = templBuffer.WriteString("</body></html>")
 		if err != nil {
 			return err
 		}
diff --git a/examples/syntax-and-usage/components/templsyntax_templ.go b/examples/syntax-and-usage/components/templsyntax_templ.go
index 6e741c490..abf5e7765 100644
--- a/examples/syntax-and-usage/components/templsyntax_templ.go
+++ b/examples/syntax-and-usage/components/templsyntax_templ.go
@@ -22,19 +22,15 @@ func list(items []string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<ol>")
 		if err != nil {
 			return err
 		}
-		// For
 		for _, item := range items {
-			// Element (standard)
 			_, err = templBuffer.WriteString("<li>")
 			if err != nil {
 				return err
 			}
-			// StringExpression
 			var var_2 string = item
 			_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 			if err != nil {
diff --git a/generator/generator.go b/generator/generator.go
index de8a04d10..c486fdbd1 100644
--- a/generator/generator.go
+++ b/generator/generator.go
@@ -240,9 +240,6 @@ func (g *generator) writeCSS(n parser.CSSTemplate) error {
 }
 
 func (g *generator) writeGoExpression(n parser.GoExpression) (err error) {
-	if _, err = g.w.WriteIndent(0, "// GoExpression\n"); err != nil {
-		return err
-	}
 	r, err := g.w.Write(n.Expression.Value)
 	if err != nil {
 		return err
@@ -495,22 +492,13 @@ func (g *generator) writeNode(indentLevel int, current parser.Node) (err error)
 }
 
 func (g *generator) writeDocType(indentLevel int, n parser.DocType) (err error) {
-	if _, err = g.w.WriteIndent(indentLevel, "// DocType\n"); err != nil {
-		return err
-	}
-	if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf("_, err = templBuffer.WriteString(`<!doctype %s>`)\n", n.Value)); err != nil {
-		return err
-	}
-	if err = g.writeErrorHandler(indentLevel); err != nil {
+	if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf("<!doctype %s>", n.Value)); err != nil {
 		return err
 	}
 	return nil
 }
 
 func (g *generator) writeIfExpression(indentLevel int, n parser.IfExpression) (err error) {
-	if _, err = g.w.WriteIndent(indentLevel, "// If\n"); err != nil {
-		return err
-	}
 	var r parser.Range
 	// if
 	if _, err = g.w.WriteIndent(indentLevel, `if `); err != nil {
@@ -575,9 +563,6 @@ func (g *generator) writeIfExpression(indentLevel int, n parser.IfExpression) (e
 }
 
 func (g *generator) writeSwitchExpression(indentLevel int, n parser.SwitchExpression) (err error) {
-	if _, err = g.w.WriteIndent(indentLevel, "// Switch\n"); err != nil {
-		return err
-	}
 	var r parser.Range
 	// switch
 	if _, err = g.w.WriteIndent(indentLevel, `switch `); err != nil {
@@ -616,9 +601,6 @@ func (g *generator) writeSwitchExpression(indentLevel int, n parser.SwitchExpres
 }
 
 func (g *generator) writeChildrenExpression(indentLevel int) (err error) {
-	if _, err = g.w.WriteIndent(indentLevel, "// Children\n"); err != nil {
-		return err
-	}
 	if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf("err = %s.Render(ctx, templBuffer)\n", g.childrenVar)); err != nil {
 		return err
 	}
@@ -629,9 +611,6 @@ func (g *generator) writeChildrenExpression(indentLevel int) (err error) {
 }
 
 func (g *generator) writeTemplElementExpression(indentLevel int, n parser.TemplElementExpression) (err error) {
-	if _, err = g.w.WriteIndent(indentLevel, "// TemplElement\n"); err != nil {
-		return err
-	}
 	if len(n.Children) == 0 {
 		return g.writeSelfClosingTemplElementExpression(indentLevel, n)
 	}
@@ -712,9 +691,6 @@ func (g *generator) writeSelfClosingTemplElementExpression(indentLevel int, n pa
 }
 
 func (g *generator) writeCallTemplateExpression(indentLevel int, n parser.CallTemplateExpression) (err error) {
-	if _, err = g.w.WriteIndent(indentLevel, "// CallTemplate\n"); err != nil {
-		return err
-	}
 	if _, err = g.w.WriteIndent(indentLevel, `err = `); err != nil {
 		return err
 	}
@@ -735,9 +711,6 @@ func (g *generator) writeCallTemplateExpression(indentLevel int, n parser.CallTe
 }
 
 func (g *generator) writeForExpression(indentLevel int, n parser.ForExpression) (err error) {
-	if _, err = g.w.WriteIndent(indentLevel, "// For\n"); err != nil {
-		return err
-	}
 	var r parser.Range
 	// for
 	if _, err = g.w.WriteIndent(indentLevel, `for `); err != nil {
@@ -791,36 +764,24 @@ func (g *generator) writeElement(indentLevel int, n parser.Element) (err error)
 }
 
 func (g *generator) writeVoidElement(indentLevel int, n parser.Element) (err error) {
-	if _, err = g.w.WriteIndent(indentLevel, "// Element (void)\n"); err != nil {
-		return err
-	}
 	if len(n.Children) > 0 {
 		return fmt.Errorf("writeVoidElement: void element %q must not have child elements", n.Name)
 	}
 	if len(n.Attributes) == 0 {
 		// <br>
-		if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf(`_, err = templBuffer.WriteString("<%s>")`+"\n", html.EscapeString(n.Name))); err != nil {
-			return err
-		}
-		if err = g.writeErrorHandler(indentLevel); err != nil {
+		if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(`<%s>`, html.EscapeString(n.Name))); err != nil {
 			return err
 		}
 	} else {
 		// <hr
-		if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf(`_, err = templBuffer.WriteString("<%s")`+"\n", html.EscapeString(n.Name))); err != nil {
-			return err
-		}
-		if err = g.writeErrorHandler(indentLevel); err != nil {
+		if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(`<%s`, html.EscapeString(n.Name))); err != nil {
 			return err
 		}
 		if err = g.writeElementAttributes(indentLevel, n.Name, n.Attributes); err != nil {
 			return err
 		}
 		// >
-		if _, err = g.w.WriteIndent(indentLevel, `_, err = templBuffer.WriteString(">")`+"\n"); err != nil {
-			return err
-		}
-		if err = g.writeErrorHandler(indentLevel); err != nil {
+		if _, err = g.w.WriteStringLiteral(indentLevel, `>`); err != nil {
 			return err
 		}
 	}
@@ -828,15 +789,9 @@ func (g *generator) writeVoidElement(indentLevel int, n parser.Element) (err err
 }
 
 func (g *generator) writeStandardElement(indentLevel int, n parser.Element) (err error) {
-	if _, err = g.w.WriteIndent(indentLevel, "// Element (standard)\n"); err != nil {
-		return err
-	}
 	if len(n.Attributes) == 0 {
 		// <div>
-		if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf(`_, err = templBuffer.WriteString("<%s>")`+"\n", html.EscapeString(n.Name))); err != nil {
-			return err
-		}
-		if err = g.writeErrorHandler(indentLevel); err != nil {
+		if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(`<%s>`, html.EscapeString(n.Name))); err != nil {
 			return err
 		}
 	} else {
@@ -849,20 +804,14 @@ func (g *generator) writeStandardElement(indentLevel int, n parser.Element) (err
 			return err
 		}
 		// <div
-		if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf(`_, err = templBuffer.WriteString("<%s")`+"\n", html.EscapeString(n.Name))); err != nil {
-			return err
-		}
-		if err = g.writeErrorHandler(indentLevel); err != nil {
+		if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(`<%s`, html.EscapeString(n.Name))); err != nil {
 			return err
 		}
 		if err = g.writeElementAttributes(indentLevel, n.Name, n.Attributes); err != nil {
 			return err
 		}
 		// >
-		if _, err = g.w.WriteIndent(indentLevel, `_, err = templBuffer.WriteString(">")`+"\n"); err != nil {
-			return err
-		}
-		if err = g.writeErrorHandler(indentLevel); err != nil {
+		if _, err = g.w.WriteStringLiteral(indentLevel, `>`); err != nil {
 			return err
 		}
 	}
@@ -871,10 +820,7 @@ func (g *generator) writeStandardElement(indentLevel int, n parser.Element) (err
 		return err
 	}
 	// </div>
-	if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf(`_, err = templBuffer.WriteString("</%s>")`+"\n", html.EscapeString(n.Name))); err != nil {
-		return err
-	}
-	if err = g.writeErrorHandler(indentLevel); err != nil {
+	if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(`</%s>`, html.EscapeString(n.Name))); err != nil {
 		return err
 	}
 	return err
@@ -887,9 +833,6 @@ func (g *generator) writeAttributeCSS(indentLevel int, attr parser.ExpressionAtt
 		ok = false
 		return
 	}
-	if _, err = g.w.WriteIndent(indentLevel, "// Element CSS\n"); err != nil {
-		return
-	}
 	// Create a class name for the style.
 	// The expression can either be expecting a templ.Classes call, or an expression that returns
 	// var templCSSClassess = []any{
@@ -964,9 +907,6 @@ func (g *generator) writeElementScript(indentLevel int, n parser.Element) (err e
 	if len(scriptExpressions) == 0 {
 		return
 	}
-	if _, err = g.w.WriteIndent(indentLevel, "// Element Script\n"); err != nil {
-		return err
-	}
 	// Render the scripts before the element if required.
 	// err = templ.RenderScriptItems(ctx, templBuffer, a, b, c)
 	if _, err = g.w.WriteIndent(indentLevel, "err = templ.RenderScriptItems(ctx, templBuffer, "+strings.Join(scriptExpressions, ", ")+")\n"); err != nil {
@@ -980,10 +920,7 @@ func (g *generator) writeElementScript(indentLevel int, n parser.Element) (err e
 
 func (g *generator) writeBoolConstantAttribute(indentLevel int, attr parser.BoolConstantAttribute) (err error) {
 	name := html.EscapeString(attr.Name)
-	if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf(`_, err = templBuffer.WriteString(" %s")`+"\n", name)); err != nil {
-		return err
-	}
-	if err = g.writeErrorHandler(indentLevel); err != nil {
+	if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(` %s`, name)); err != nil {
 		return err
 	}
 	return nil
@@ -992,10 +929,7 @@ func (g *generator) writeBoolConstantAttribute(indentLevel int, attr parser.Bool
 func (g *generator) writeConstantAttribute(indentLevel int, attr parser.ConstantAttribute) (err error) {
 	name := html.EscapeString(attr.Name)
 	value := html.EscapeString(attr.Value)
-	if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf(`_, err = templBuffer.WriteString(" %s=\"%s\"")`+"\n", name, value)); err != nil {
-		return err
-	}
-	if err = g.writeErrorHandler(indentLevel); err != nil {
+	if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(` %s=\"%s\"`, name, value)); err != nil {
 		return err
 	}
 	return nil
@@ -1019,10 +953,7 @@ func (g *generator) writeBoolExpressionAttribute(indentLevel int, attr parser.Bo
 	}
 	{
 		indentLevel++
-		if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf(`_, err = templBuffer.WriteString(" %s")`+"\n", name)); err != nil {
-			return err
-		}
-		if err = g.writeErrorHandler(indentLevel); err != nil {
+		if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(` %s`, name)); err != nil {
 			return err
 		}
 		indentLevel--
@@ -1037,18 +968,12 @@ func (g *generator) writeBoolExpressionAttribute(indentLevel int, attr parser.Bo
 func (g *generator) writeExpressionAttribute(indentLevel int, elementName string, attr parser.ExpressionAttribute) (err error) {
 	attrName := html.EscapeString(attr.Name)
 	// Name
-	if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf(`_, err = templBuffer.WriteString(" %s=")`+"\n", attrName)); err != nil {
-		return err
-	}
-	if err = g.writeErrorHandler(indentLevel); err != nil {
+	if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(` %s=`, attrName)); err != nil {
 		return err
 	}
 	// Value.
 	// Open quote.
-	if _, err = g.w.WriteIndent(indentLevel, `_, err = templBuffer.WriteString("\"")`+"\n"); err != nil {
-		return err
-	}
-	if err = g.writeErrorHandler(indentLevel); err != nil {
+	if _, err = g.w.WriteStringLiteral(indentLevel, `\"`); err != nil {
 		return err
 	}
 	if elementName == "a" && attr.Name == "href" {
@@ -1116,10 +1041,7 @@ func (g *generator) writeExpressionAttribute(indentLevel int, elementName string
 		}
 	}
 	// Close quote.
-	if _, err = g.w.WriteIndent(indentLevel, `_, err = templBuffer.WriteString("\"")`+"\n"); err != nil {
-		return err
-	}
-	if err = g.writeErrorHandler(indentLevel); err != nil {
+	if _, err = g.w.WriteStringLiteral(indentLevel, `\"`); err != nil {
 		return err
 	}
 	return nil
@@ -1168,9 +1090,6 @@ func (g *generator) writeConditionalAttribute(indentLevel int, elementName strin
 }
 
 func (g *generator) writeElementAttributes(indentLevel int, name string, attrs []parser.Attribute) (err error) {
-	if _, err = g.w.WriteIndent(indentLevel, "// Element Attributes\n"); err != nil {
-		return err
-	}
 	for i := 0; i < len(attrs); i++ {
 		switch attr := attrs[i].(type) {
 		case parser.BoolConstantAttribute:
@@ -1191,33 +1110,21 @@ func (g *generator) writeElementAttributes(indentLevel int, name string, attrs [
 }
 
 func (g *generator) writeRawElement(indentLevel int, n parser.RawElement) (err error) {
-	if _, err = g.w.WriteIndent(indentLevel, "// RawElement\n"); err != nil {
-		return err
-	}
 	if len(n.Attributes) == 0 {
 		// <div>
-		if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf(`_, err = templBuffer.WriteString("<%s>")`+"\n", html.EscapeString(n.Name))); err != nil {
-			return err
-		}
-		if err = g.writeErrorHandler(indentLevel); err != nil {
+		if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(`<%s>`, html.EscapeString(n.Name))); err != nil {
 			return err
 		}
 	} else {
 		// <div
-		if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf(`_, err = templBuffer.WriteString("<%s")`+"\n", html.EscapeString(n.Name))); err != nil {
-			return err
-		}
-		if err = g.writeErrorHandler(indentLevel); err != nil {
+		if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(`<%s`, html.EscapeString(n.Name))); err != nil {
 			return err
 		}
 		if err = g.writeElementAttributes(indentLevel, n.Name, n.Attributes); err != nil {
 			return err
 		}
 		// >
-		if _, err = g.w.WriteIndent(indentLevel, `_, err = templBuffer.WriteString(">")`+"\n"); err != nil {
-			return err
-		}
-		if err = g.writeErrorHandler(indentLevel); err != nil {
+		if _, err = g.w.WriteStringLiteral(indentLevel, `>`); err != nil {
 			return err
 		}
 	}
@@ -1226,10 +1133,7 @@ func (g *generator) writeRawElement(indentLevel int, n parser.RawElement) (err e
 		return err
 	}
 	// </div>
-	if _, err = g.w.WriteIndent(indentLevel, fmt.Sprintf(`_, err = templBuffer.WriteString("</%s>")`+"\n", html.EscapeString(n.Name))); err != nil {
-		return err
-	}
-	if err = g.writeErrorHandler(indentLevel); err != nil {
+	if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(`</%s>`, html.EscapeString(n.Name))); err != nil {
 		return err
 	}
 	return err
@@ -1244,9 +1148,6 @@ func (g *generator) writeStringExpression(indentLevel int, e parser.Expression)
 	if strings.TrimSpace(e.Value) == "" {
 		return
 	}
-	if _, err = g.w.WriteIndent(indentLevel, "// StringExpression\n"); err != nil {
-		return err
-	}
 	var r parser.Range
 	vn := g.createVariableName()
 	// var vn string = sExpr
@@ -1272,23 +1173,14 @@ func (g *generator) writeWhitespace(indentLevel int, n parser.Whitespace) (err e
 	if len(n.Value) == 0 {
 		return
 	}
-	if _, err = g.w.WriteIndent(indentLevel, "// Whitespace (normalised)\n"); err != nil {
-		return err
-	}
 	// _, err = templBuffer.WriteString(` `)
-	if _, err = g.w.WriteIndent(indentLevel, "_, err = templBuffer.WriteString(` `)\n"); err != nil {
-		return err
-	}
-	if err = g.writeErrorHandler(indentLevel); err != nil {
+	if _, err = g.w.WriteStringLiteral(indentLevel, " "); err != nil {
 		return err
 	}
 	return nil
 }
 
 func (g *generator) writeText(indentLevel int, n parser.Text) (err error) {
-	if _, err = g.w.WriteIndent(indentLevel, "// Text\n"); err != nil {
-		return err
-	}
 	vn := g.createVariableName()
 	// vn := sExpr
 	if _, err = g.w.WriteIndent(indentLevel, vn+" := "+createGoString(n.Value)+"\n"); err != nil {
diff --git a/generator/generator_test.go b/generator/generator_test.go
index f430ebb6d..c2e85874d 100644
--- a/generator/generator_test.go
+++ b/generator/generator_test.go
@@ -23,9 +23,7 @@ func TestGeneratorSourceMap(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to write Go expression: %v", err)
 	}
-	// The from value is (16, 1, 0) because the generator prefixes the
-	// expression with a "// GoExpression" comment.
-	expected := parser.NewPosition(16, 1, 0)
+	expected := parser.NewPosition(0, 0, 0)
 
 	actual, ok := g.sourceMap.TargetPositionFromSource(0, 0)
 	if !ok {
diff --git a/generator/rangewriter.go b/generator/rangewriter.go
index c1a648d76..2a3f974a8 100644
--- a/generator/rangewriter.go
+++ b/generator/rangewriter.go
@@ -14,19 +14,62 @@ func NewRangeWriter(w io.Writer) *RangeWriter {
 }
 
 type RangeWriter struct {
-	Current parser.Position
-	w       io.Writer
+	Current   parser.Position
+	inLiteral bool
+	w         io.Writer
+}
+
+func (rw *RangeWriter) closeLiteral(indent int) (r parser.Range, err error) {
+	rw.inLiteral = false
+	_, err = rw.write("\")\n")
+	if err != nil {
+		return
+	}
+	err = rw.writeErrorHandler(indent)
+	return
 }
 
 func (rw *RangeWriter) WriteIndent(level int, s string) (r parser.Range, err error) {
-	_, err = rw.Write(strings.Repeat("\t", level))
+	if rw.inLiteral {
+		if _, err = rw.closeLiteral(level); err != nil {
+			return
+		}
+	}
+	_, err = rw.write(strings.Repeat("\t", level))
+	if err != nil {
+		return
+	}
+	return rw.write(s)
+}
+
+func (rw *RangeWriter) WriteStringLiteral(level int, s string) (r parser.Range, err error) {
+	if !rw.inLiteral {
+		_, err = rw.write(strings.Repeat("\t", level))
+		if err != nil {
+			return
+		}
+		if _, err = rw.WriteIndent(level, `_, err = templBuffer.WriteString("`); err != nil {
+			return
+		}
+	}
+	_, err = rw.write(s)
 	if err != nil {
 		return
 	}
-	return rw.Write(s)
+	rw.inLiteral = true
+	return
 }
 
 func (rw *RangeWriter) Write(s string) (r parser.Range, err error) {
+	if rw.inLiteral {
+		if _, err = rw.closeLiteral(0); err != nil {
+			return
+		}
+	}
+	return rw.write(s)
+}
+
+func (rw *RangeWriter) write(s string) (r parser.Range, err error) {
 	r.From = parser.Position{
 		Index: rw.Current.Index,
 		Line:  rw.Current.Line,
@@ -48,3 +91,21 @@ func (rw *RangeWriter) Write(s string) (r parser.Range, err error) {
 	r.To = rw.Current
 	return r, err
 }
+
+func (rw *RangeWriter) writeErrorHandler(indentLevel int) (err error) {
+	_, err = rw.WriteIndent(indentLevel, "if err != nil {\n")
+	if err != nil {
+		return err
+	}
+	indentLevel++
+	_, err = rw.WriteIndent(indentLevel, "return err\n")
+	if err != nil {
+		return err
+	}
+	indentLevel--
+	_, err = rw.WriteIndent(indentLevel, "}\n")
+	if err != nil {
+		return err
+	}
+	return err
+}
diff --git a/generator/test-a-href/template_templ.go b/generator/test-a-href/template_templ.go
index d421226a8..9a2544fff 100644
--- a/generator/test-a-href/template_templ.go
+++ b/generator/test-a-href/template_templ.go
@@ -22,41 +22,16 @@ func render() templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<a")
+		_, err = templBuffer.WriteString("<a href=\"javascript:alert(&#39;unaffected&#39;);\">")
 		if err != nil {
 			return err
 		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" href=\"javascript:alert(&#39;unaffected&#39;);\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_2 := `Ignored`
 		_, err = templBuffer.WriteString(var_2)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</a>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<a")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" href=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("</a><a href=\"")
 		if err != nil {
 			return err
 		}
@@ -65,35 +40,16 @@ func render() templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_4 := `Sanitized`
 		_, err = templBuffer.WriteString(var_4)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</a>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<a")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" href=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("</a><a href=\"")
 		if err != nil {
 			return err
 		}
@@ -102,15 +58,10 @@ func render() templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("\">")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_6 := `Unsanitized`
 		_, err = templBuffer.WriteString(var_6)
 		if err != nil {
diff --git a/generator/test-attribute-escaping/template_templ.go b/generator/test-attribute-escaping/template_templ.go
index 38f7ce70e..8e6f2172f 100644
--- a/generator/test-attribute-escaping/template_templ.go
+++ b/generator/test-attribute-escaping/template_templ.go
@@ -22,22 +22,7 @@ func BasicTemplate(url string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<a")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" href=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<div><a href=\"")
 		if err != nil {
 			return err
 		}
@@ -46,25 +31,16 @@ func BasicTemplate(url string) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("\">")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_3 := `text`
 		_, err = templBuffer.WriteString(var_3)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</a>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
+		_, err = templBuffer.WriteString("</a></div>")
 		if err != nil {
 			return err
 		}
diff --git a/generator/test-call/template_templ.go b/generator/test-call/template_templ.go
index 9dce52fa1..a8d3e2202 100644
--- a/generator/test-call/template_templ.go
+++ b/generator/test-call/template_templ.go
@@ -22,45 +22,16 @@ func personTemplate(p person) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
+		_, err = templBuffer.WriteString("<div><h1>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1>")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_2 string = p.name
 		_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</h1>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" style=\"font-family: &#39;sans-serif&#39;\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" id=\"test\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" data-contents=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("</h1><div style=\"font-family: &#39;sans-serif&#39;\" id=\"test\" data-contents=\"")
 		if err != nil {
 			return err
 		}
@@ -68,24 +39,15 @@ func personTemplate(p person) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// CallTemplate
 		err = email(p.email).Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
+		_, err = templBuffer.WriteString("</div></div>")
 		if err != nil {
 			return err
 		}
@@ -109,28 +71,16 @@ func email(s string) templ.Component {
 			var_3 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<div>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_4 := `email:`
 		_, err = templBuffer.WriteString(var_4)
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<a")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" href=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<a href=\"")
 		if err != nil {
 			return err
 		}
@@ -139,25 +89,16 @@ func email(s string) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_6 string = s
 		_, err = templBuffer.WriteString(templ.EscapeString(var_6))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</a>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
+		_, err = templBuffer.WriteString("</a></div>")
 		if err != nil {
 			return err
 		}
diff --git a/generator/test-complex-attributes/template_templ.go b/generator/test-complex-attributes/template_templ.go
index e0363ba9c..d86d1067c 100644
--- a/generator/test-complex-attributes/template_templ.go
+++ b/generator/test-complex-attributes/template_templ.go
@@ -22,149 +22,25 @@ func ComplexAttributes() templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
+		_, err = templBuffer.WriteString("<div x-data=\"{darkMode: localStorage.getItem(&#39;darkMode&#39;) || localStorage.setItem(&#39;darkMode&#39;, &#39;system&#39;)}\" x-init=\"$watch(&#39;darkMode&#39;, val =&gt; localStorage.setItem(&#39;darkMode&#39;, val))\" :class=\"{&#39;dark&#39;: darkMode === &#39;dark&#39; || (darkMode === &#39;system&#39; &amp;&amp; window.matchMedia(&#39;(prefers-color-scheme: dark)&#39;).matches)}\"></div><div x-data=\"{ count: 0 }\"><button x-on:click=\"count++\">")
 		if err != nil {
 			return err
 		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" x-data=\"{darkMode: localStorage.getItem(&#39;darkMode&#39;) || localStorage.setItem(&#39;darkMode&#39;, &#39;system&#39;)}\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" x-init=\"$watch(&#39;darkMode&#39;, val =&gt; localStorage.setItem(&#39;darkMode&#39;, val))\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" :class=\"{&#39;dark&#39;: darkMode === &#39;dark&#39; || (darkMode === &#39;system&#39; &amp;&amp; window.matchMedia(&#39;(prefers-color-scheme: dark)&#39;).matches)}\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" x-data=\"{ count: 0 }\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<button")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" x-on:click=\"count++\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_2 := `Increment`
 		_, err = templBuffer.WriteString(var_2)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</button>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<span")
+		_, err = templBuffer.WriteString("</button><span x-text=\"count\"></span></div><div x-data=\"{ count: 0 }\"><button @click=\"count++\">")
 		if err != nil {
 			return err
 		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" x-text=\"count\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</span>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" x-data=\"{ count: 0 }\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<button")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" @click=\"count++\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_3 := `Increment`
 		_, err = templBuffer.WriteString(var_3)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</button>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<span")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" x-text=\"count\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</span>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
+		_, err = templBuffer.WriteString("</button><span x-text=\"count\"></span></div>")
 		if err != nil {
 			return err
 		}
diff --git a/generator/test-css-usage/template_templ.go b/generator/test-css-usage/template_templ.go
index c2e03685f..8db261d0e 100644
--- a/generator/test-css-usage/template_templ.go
+++ b/generator/test-css-usage/template_templ.go
@@ -44,23 +44,12 @@ func Button(text string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		// Element CSS
 		var var_2 = []any{className(), templ.Class("&&&unsafe"), "safe", templ.SafeClass("safe2")}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_2...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<button")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<button class=\"")
 		if err != nil {
 			return err
 		}
@@ -68,19 +57,10 @@ func Button(text string) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\" type=\"button\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(" type=\"button\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_3 string = text
 		_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 		if err != nil {
@@ -110,23 +90,12 @@ func LegacySupport() templ.Component {
 			var_4 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		// Element CSS
 		var var_5 = []any{templ.Classes(templ.Class("test"), "a")}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_5...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<div class=\"")
 		if err != nil {
 			return err
 		}
@@ -134,15 +103,7 @@ func LegacySupport() templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
+		_, err = templBuffer.WriteString("\"></div>")
 		if err != nil {
 			return err
 		}
@@ -166,23 +127,12 @@ func MapCSSExample() templ.Component {
 			var_6 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		// Element CSS
 		var var_7 = []any{map[string]bool{"a": true, "b": false, "c": true}}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_7...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<div class=\"")
 		if err != nil {
 			return err
 		}
@@ -190,15 +140,7 @@ func MapCSSExample() templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
+		_, err = templBuffer.WriteString("\"></div>")
 		if err != nil {
 			return err
 		}
@@ -222,23 +164,12 @@ func KVExample() templ.Component {
 			var_8 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		// Element CSS
 		var var_9 = []any{"a", templ.KV("b", false)}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_9...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<div class=\"")
 		if err != nil {
 			return err
 		}
@@ -246,15 +177,7 @@ func KVExample() templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
+		_, err = templBuffer.WriteString("\"></div>")
 		if err != nil {
 			return err
 		}
@@ -278,33 +201,20 @@ func ThreeButtons() templ.Component {
 			var_10 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// CallTemplate
 		err = Button("A").Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		// CallTemplate
 		err = Button("B").Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		// Element CSS
 		var var_11 = []any{templ.Classes(green)}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_11...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<button")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" class=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<button class=\"")
 		if err != nil {
 			return err
 		}
@@ -312,19 +222,10 @@ func ThreeButtons() templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" type=\"button\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("\" type=\"button\">")
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_12 string = "Green"
 		_, err = templBuffer.WriteString(templ.EscapeString(var_12))
 		if err != nil {
@@ -334,12 +235,10 @@ func ThreeButtons() templ.Component {
 		if err != nil {
 			return err
 		}
-		// CallTemplate
 		err = MapCSSExample().Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		// CallTemplate
 		err = KVExample().Render(ctx, templBuffer)
 		if err != nil {
 			return err
diff --git a/generator/test-doctype/template_templ.go b/generator/test-doctype/template_templ.go
index 51aaf56ee..e9edbd6ec 100644
--- a/generator/test-doctype/template_templ.go
+++ b/generator/test-doctype/template_templ.go
@@ -22,115 +22,25 @@ func Layout(title, content string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// DocType
-		_, err = templBuffer.WriteString(`<!doctype html>`)
+		_, err = templBuffer.WriteString("<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><title>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<html")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" lang=\"en\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<head>")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<meta")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" charset=\"UTF-8\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<meta")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" http-equiv=\"X-UA-Compatible\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" content=\"IE=edge\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<meta")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" name=\"viewport\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" content=\"width=device-width, initial-scale=1.0\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<title>")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_2 string = title
 		_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</title>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</head>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<body>")
+		_, err = templBuffer.WriteString("</title></head><body>")
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_3 string = content
 		_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</body>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</html>")
+		_, err = templBuffer.WriteString("</body></html>")
 		if err != nil {
 			return err
 		}
diff --git a/generator/test-element-attributes/template_templ.go b/generator/test-element-attributes/template_templ.go
index b3cbe1376..bb49a0cf0 100644
--- a/generator/test-element-attributes/template_templ.go
+++ b/generator/test-element-attributes/template_templ.go
@@ -43,29 +43,17 @@ func render(p person) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		// Element CSS
 		var var_2 = []any{important()}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_2...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" style=\"width: 100;\"")
+		_, err = templBuffer.WriteString("<div style=\"width: 100;\"")
 		if err != nil {
 			return err
 		}
 		if p.important {
-			// Element Attributes
-			_, err = templBuffer.WriteString(" class=")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("\"")
+			_, err = templBuffer.WriteString(" class=\"")
 			if err != nil {
 				return err
 			}
@@ -82,7 +70,6 @@ func render(p person) templ.Component {
 		if err != nil {
 			return err
 		}
-		// Text
 		var_3 := `Important`
 		_, err = templBuffer.WriteString(var_3)
 		if err != nil {
@@ -92,29 +79,17 @@ func render(p person) templ.Component {
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		// Element CSS
 		var var_4 = []any{unimportant}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_4...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" style=\"width: 100;\"")
+		_, err = templBuffer.WriteString("<div style=\"width: 100;\"")
 		if err != nil {
 			return err
 		}
 		if !p.important {
-			// Element Attributes
-			_, err = templBuffer.WriteString(" class=")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("\"")
+			_, err = templBuffer.WriteString(" class=\"")
 			if err != nil {
 				return err
 			}
@@ -131,7 +106,6 @@ func render(p person) templ.Component {
 		if err != nil {
 			return err
 		}
-		// Text
 		var_5 := `Unimportant`
 		_, err = templBuffer.WriteString(var_5)
 		if err != nil {
@@ -141,35 +115,22 @@ func render(p person) templ.Component {
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		// Element CSS
 		var var_6 = []any{important}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_6...)
 		if err != nil {
 			return err
 		}
-		// Element CSS
 		var var_7 = []any{unimportant}
 		err = templ.RenderCSSItems(ctx, templBuffer, var_7...)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" style=\"width: 100;\"")
+		_, err = templBuffer.WriteString("<div style=\"width: 100;\"")
 		if err != nil {
 			return err
 		}
 		if p.important {
-			// Element Attributes
-			_, err = templBuffer.WriteString(" class=")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("\"")
+			_, err = templBuffer.WriteString(" class=\"")
 			if err != nil {
 				return err
 			}
@@ -182,12 +143,7 @@ func render(p person) templ.Component {
 				return err
 			}
 		} else {
-			// Element Attributes
-			_, err = templBuffer.WriteString(" class=")
-			if err != nil {
-				return err
-			}
-			_, err = templBuffer.WriteString("\"")
+			_, err = templBuffer.WriteString(" class=\"")
 			if err != nil {
 				return err
 			}
@@ -204,7 +160,6 @@ func render(p person) templ.Component {
 		if err != nil {
 			return err
 		}
-		// Text
 		var_8 := `Else`
 		_, err = templBuffer.WriteString(var_8)
 		if err != nil {
diff --git a/generator/test-elseif/template_templ.go b/generator/test-elseif/template_templ.go
index fa20757e7..d652a2af2 100644
--- a/generator/test-elseif/template_templ.go
+++ b/generator/test-elseif/template_templ.go
@@ -22,92 +22,69 @@ func render(d data) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<div>")
 		if err != nil {
 			return err
 		}
-		// If
 		if d.IsTrue() {
-			// StringExpression
 			var var_2 string = "True"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 			if err != nil {
 				return err
 			}
 		} else if !d.IsTrue() {
-			// StringExpression
 			var var_3 string = "False"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 			if err != nil {
 				return err
 			}
 		} else {
-			// StringExpression
 			var var_4 string = "Else"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_4))
 			if err != nil {
 				return err
 			}
 		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
+		_, err = templBuffer.WriteString("</div><div>")
 		if err != nil {
 			return err
 		}
-		// If
 		if 1 == 2 {
-			// StringExpression
 			var var_5 string = "If"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_5))
 			if err != nil {
 				return err
 			}
 		} else if 1 == 1 {
-			// StringExpression
 			var var_6 string = "ElseIf"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_6))
 			if err != nil {
 				return err
 			}
 		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
+		_, err = templBuffer.WriteString("</div><div>")
 		if err != nil {
 			return err
 		}
-		// If
 		if 1 == 2 {
-			// StringExpression
 			var var_7 string = "If"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_7))
 			if err != nil {
 				return err
 			}
 		} else if 1 == 3 {
-			// StringExpression
 			var var_8 string = "ElseIf"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_8))
 			if err != nil {
 				return err
 			}
 		} else if 1 == 4 {
-			// StringExpression
 			var var_9 string = "ElseIf"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_9))
 			if err != nil {
 				return err
 			}
 		} else if 1 == 1 {
-			// StringExpression
 			var var_10 string = "OK"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_10))
 			if err != nil {
diff --git a/generator/test-for/template_templ.go b/generator/test-for/template_templ.go
index dc5775939..f0bb10f54 100644
--- a/generator/test-for/template_templ.go
+++ b/generator/test-for/template_templ.go
@@ -22,14 +22,11 @@ func render(items []string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// For
 		for _, item := range items {
-			// Element (standard)
 			_, err = templBuffer.WriteString("<div>")
 			if err != nil {
 				return err
 			}
-			// StringExpression
 			var var_2 string = item
 			_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 			if err != nil {
diff --git a/generator/test-html/template_templ.go b/generator/test-html/template_templ.go
index fa4da63ca..c17db5db8 100644
--- a/generator/test-html/template_templ.go
+++ b/generator/test-html/template_templ.go
@@ -22,45 +22,16 @@ func render(p person) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
+		_, err = templBuffer.WriteString("<div><h1>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1>")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_2 string = p.name
 		_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</h1>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" style=\"font-family: &#39;sans-serif&#39;\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" id=\"test\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" data-contents=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("</h1><div style=\"font-family: &#39;sans-serif&#39;\" id=\"test\" data-contents=\"")
 		if err != nil {
 			return err
 		}
@@ -68,36 +39,16 @@ func render(p person) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("\"><div>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_3 := `email:`
 		_, err = templBuffer.WriteString(var_3)
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<a")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" href=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<a href=\"")
 		if err != nil {
 			return err
 		}
@@ -106,59 +57,26 @@ func render(p person) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_5 string = p.email
 		_, err = templBuffer.WriteString(templ.EscapeString(var_5))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</a>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<hr")
+		_, err = templBuffer.WriteString("</a></div></div></div><hr")
 		if err != nil {
 			return err
 		}
-		// Element Attributes
 		if true {
 			_, err = templBuffer.WriteString(" noshade")
 			if err != nil {
 				return err
 			}
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<hr")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" optionA")
+		_, err = templBuffer.WriteString("><hr optionA")
 		if err != nil {
 			return err
 		}
@@ -178,21 +96,7 @@ func render(p person) templ.Component {
 				return err
 			}
 		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<hr")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" noshade")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("><hr noshade>")
 		if err != nil {
 			return err
 		}
diff --git a/generator/test-if/template_templ.go b/generator/test-if/template_templ.go
index e73d7a967..edb00f8da 100644
--- a/generator/test-if/template_templ.go
+++ b/generator/test-if/template_templ.go
@@ -22,16 +22,13 @@ func render(d data) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// If
 		if d.IsTrue() {
-			// StringExpression
 			var var_2 string = "True"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 			if err != nil {
 				return err
 			}
 		} else {
-			// StringExpression
 			var var_3 string = "False"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 			if err != nil {
diff --git a/generator/test-ifelse/template_templ.go b/generator/test-ifelse/template_templ.go
index 63da7da61..d7b7d5026 100644
--- a/generator/test-ifelse/template_templ.go
+++ b/generator/test-ifelse/template_templ.go
@@ -22,16 +22,13 @@ func render(d data) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// If
 		if d.IsTrue() {
-			// StringExpression
 			var var_2 string = "True"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 			if err != nil {
 				return err
 			}
 		} else {
-			// StringExpression
 			var var_3 string = "False"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 			if err != nil {
diff --git a/generator/test-import/template_templ.go b/generator/test-import/template_templ.go
index dba44baf8..c3395bc0e 100644
--- a/generator/test-import/template_templ.go
+++ b/generator/test-import/template_templ.go
@@ -22,12 +22,10 @@ func listItem() templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<li>")
 		if err != nil {
 			return err
 		}
-		// Children
 		err = var_1.Render(ctx, templBuffer)
 		if err != nil {
 			return err
@@ -56,12 +54,10 @@ func list() templ.Component {
 			var_2 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<ul>")
 		if err != nil {
 			return err
 		}
-		// Children
 		err = var_2.Render(ctx, templBuffer)
 		if err != nil {
 			return err
@@ -90,26 +86,22 @@ func main() templ.Component {
 			var_3 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// TemplElement
 		var_4 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
 			templBuffer, templIsBuffer := w.(*bytes.Buffer)
 			if !templIsBuffer {
 				templBuffer = templ.GetBuffer()
 				defer templ.ReleaseBuffer(templBuffer)
 			}
-			// TemplElement
 			var_5 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
 				templBuffer, templIsBuffer := w.(*bytes.Buffer)
 				if !templIsBuffer {
 					templBuffer = templ.GetBuffer()
 					defer templ.ReleaseBuffer(templBuffer)
 				}
-				// Element (standard)
 				_, err = templBuffer.WriteString("<u>")
 				if err != nil {
 					return err
 				}
-				// Text
 				var_6 := `Item 1`
 				_, err = templBuffer.WriteString(var_6)
 				if err != nil {
@@ -128,24 +120,20 @@ func main() templ.Component {
 			if err != nil {
 				return err
 			}
-			// Whitespace (normalised)
-			_, err = templBuffer.WriteString(` `)
+			_, err = templBuffer.WriteString(" ")
 			if err != nil {
 				return err
 			}
-			// TemplElement
 			var_7 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
 				templBuffer, templIsBuffer := w.(*bytes.Buffer)
 				if !templIsBuffer {
 					templBuffer = templ.GetBuffer()
 					defer templ.ReleaseBuffer(templBuffer)
 				}
-				// Element (standard)
 				_, err = templBuffer.WriteString("<u>")
 				if err != nil {
 					return err
 				}
-				// Text
 				var_8 := `Item 2`
 				_, err = templBuffer.WriteString(var_8)
 				if err != nil {
@@ -164,24 +152,20 @@ func main() templ.Component {
 			if err != nil {
 				return err
 			}
-			// Whitespace (normalised)
-			_, err = templBuffer.WriteString(` `)
+			_, err = templBuffer.WriteString(" ")
 			if err != nil {
 				return err
 			}
-			// TemplElement
 			var_9 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
 				templBuffer, templIsBuffer := w.(*bytes.Buffer)
 				if !templIsBuffer {
 					templBuffer = templ.GetBuffer()
 					defer templ.ReleaseBuffer(templBuffer)
 				}
-				// Element (standard)
 				_, err = templBuffer.WriteString("<u>")
 				if err != nil {
 					return err
 				}
-				// Text
 				var_10 := `Item 3`
 				_, err = templBuffer.WriteString(var_10)
 				if err != nil {
diff --git a/generator/test-raw-elements/template_templ.go b/generator/test-raw-elements/template_templ.go
index e30b0132c..02402a297 100644
--- a/generator/test-raw-elements/template_templ.go
+++ b/generator/test-raw-elements/template_templ.go
@@ -22,46 +22,19 @@ func Example() templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<html>")
+		_, err = templBuffer.WriteString("<html><head></head><body><style>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<head>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</head>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<body>")
-		if err != nil {
-			return err
-		}
-		// RawElement
-		_, err = templBuffer.WriteString("<style>")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_2 := `<!-- Some stuff -->`
 		_, err = templBuffer.WriteString(var_2)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</style>")
-		if err != nil {
-			return err
-		}
-		// RawElement
-		_, err = templBuffer.WriteString("<style>")
+		_, err = templBuffer.WriteString("</style><style>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_3 := `
         .customClass {
           border: 1px solid black;
@@ -71,25 +44,10 @@ func Example() templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</style>")
+		_, err = templBuffer.WriteString("</style><script type=\"text/javascript\">")
 		if err != nil {
 			return err
 		}
-		// RawElement
-		_, err = templBuffer.WriteString("<script")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" type=\"text/javascript\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_4 := `
         $("div").marquee();
         function test() {
@@ -100,30 +58,16 @@ func Example() templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</script>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1>")
+		_, err = templBuffer.WriteString("</script><h1>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_5 := `Hello`
 		_, err = templBuffer.WriteString(var_5)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</h1>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</body>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</html>")
+		_, err = templBuffer.WriteString("</h1></body></html>")
 		if err != nil {
 			return err
 		}
diff --git a/generator/test-script-usage/template_templ.go b/generator/test-script-usage/template_templ.go
index 6f0a1a540..f8191546e 100644
--- a/generator/test-script-usage/template_templ.go
+++ b/generator/test-script-usage/template_templ.go
@@ -38,22 +38,11 @@ func Button(text string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		// Element Script
 		err = templ.RenderScriptItems(ctx, templBuffer, withParameters("test", text, 123), withoutParameters())
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("<button")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" onClick=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<button onClick=\"")
 		if err != nil {
 			return err
 		}
@@ -62,15 +51,7 @@ func Button(text string) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" onMouseover=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\" onMouseover=\"")
 		if err != nil {
 			return err
 		}
@@ -79,19 +60,10 @@ func Button(text string) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\" type=\"button\">")
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString(" type=\"button\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_4 string = text
 		_, err = templBuffer.WriteString(templ.EscapeString(var_4))
 		if err != nil {
@@ -121,35 +93,18 @@ func ThreeButtons() templ.Component {
 			var_5 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// CallTemplate
 		err = Button("A").Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		// CallTemplate
 		err = Button("B").Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<button")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" onMouseover=\"console.log(&#39;mouseover&#39;)\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" type=\"button\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("<button onMouseover=\"console.log(&#39;mouseover&#39;)\" type=\"button\">")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_6 := `Button C`
 		_, err = templBuffer.WriteString(var_6)
 		if err != nil {
diff --git a/generator/test-string/template_templ.go b/generator/test-string/template_templ.go
index a0e93d02c..4c6ac9078 100644
--- a/generator/test-string/template_templ.go
+++ b/generator/test-string/template_templ.go
@@ -22,36 +22,16 @@ func render(s string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<ul>")
+		_, err = templBuffer.WriteString("<ul><li></li><li>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<li>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</li>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<li>")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_2 string = s
 		_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</li>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</ul>")
+		_, err = templBuffer.WriteString("</li></ul>")
 		if err != nil {
 			return err
 		}
diff --git a/generator/test-switch/template_templ.go b/generator/test-switch/template_templ.go
index 5dec92f24..78e40aaa1 100644
--- a/generator/test-switch/template_templ.go
+++ b/generator/test-switch/template_templ.go
@@ -22,15 +22,14 @@ func render(input string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Switch
 		switch input {
-		case "a": // StringExpression
+		case "a":
 			var var_2 string = "it was 'a'"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 			if err != nil {
 				return err
 			}
-		default: // StringExpression
+		default:
 			var var_3 string = "it was something else"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 			if err != nil {
diff --git a/generator/test-switchdefault/template_templ.go b/generator/test-switchdefault/template_templ.go
index 3d1ba3508..214d8e555 100644
--- a/generator/test-switchdefault/template_templ.go
+++ b/generator/test-switchdefault/template_templ.go
@@ -22,15 +22,14 @@ func template(input string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Switch
 		switch input {
-		case "a": // StringExpression
+		case "a":
 			var var_2 string = "it was 'a'"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 			if err != nil {
 				return err
 			}
-		default: // StringExpression
+		default:
 			var var_3 string = "it was something else"
 			_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 			if err != nil {
diff --git a/generator/test-templ-element/template_templ.go b/generator/test-templ-element/template_templ.go
index 74305a030..77754e6f9 100644
--- a/generator/test-templ-element/template_templ.go
+++ b/generator/test-templ-element/template_templ.go
@@ -9,7 +9,6 @@ import "context"
 import "io"
 import "bytes"
 
-// GoExpression
 import "fmt"
 
 func wrapper(index int) templ.Component {
@@ -25,17 +24,7 @@ func wrapper(index int) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" id=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<div id=\"")
 		if err != nil {
 			return err
 		}
@@ -43,15 +32,10 @@ func wrapper(index int) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("\">")
 		if err != nil {
 			return err
 		}
-		// Children
 		err = var_1.Render(ctx, templBuffer)
 		if err != nil {
 			return err
@@ -80,61 +64,51 @@ func template() templ.Component {
 			var_2 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// TemplElement
 		var_3 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
 			templBuffer, templIsBuffer := w.(*bytes.Buffer)
 			if !templIsBuffer {
 				templBuffer = templ.GetBuffer()
 				defer templ.ReleaseBuffer(templBuffer)
 			}
-			// Text
 			var_4 := `child1`
 			_, err = templBuffer.WriteString(var_4)
 			if err != nil {
 				return err
 			}
-			// Whitespace (normalised)
-			_, err = templBuffer.WriteString(` `)
+			_, err = templBuffer.WriteString(" ")
 			if err != nil {
 				return err
 			}
-			// TemplElement
 			var_5 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
 				templBuffer, templIsBuffer := w.(*bytes.Buffer)
 				if !templIsBuffer {
 					templBuffer = templ.GetBuffer()
 					defer templ.ReleaseBuffer(templBuffer)
 				}
-				// Text
 				var_6 := `child2`
 				_, err = templBuffer.WriteString(var_6)
 				if err != nil {
 					return err
 				}
-				// Whitespace (normalised)
-				_, err = templBuffer.WriteString(` `)
+				_, err = templBuffer.WriteString(" ")
 				if err != nil {
 					return err
 				}
-				// TemplElement
 				var_7 := templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
 					templBuffer, templIsBuffer := w.(*bytes.Buffer)
 					if !templIsBuffer {
 						templBuffer = templ.GetBuffer()
 						defer templ.ReleaseBuffer(templBuffer)
 					}
-					// Text
 					var_8 := `child3`
 					_, err = templBuffer.WriteString(var_8)
 					if err != nil {
 						return err
 					}
-					// Whitespace (normalised)
-					_, err = templBuffer.WriteString(` `)
+					_, err = templBuffer.WriteString(" ")
 					if err != nil {
 						return err
 					}
-					// TemplElement
 					err = wrapper(4).Render(ctx, templBuffer)
 					if err != nil {
 						return err
diff --git a/generator/test-text-whitespace/template_templ.go b/generator/test-text-whitespace/template_templ.go
index 194895943..d11eced06 100644
--- a/generator/test-text-whitespace/template_templ.go
+++ b/generator/test-text-whitespace/template_templ.go
@@ -22,25 +22,20 @@ func WhitespaceIsAddedWithinTemplStatements() templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<p>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_2 := `This is some text.`
 		_, err = templBuffer.WriteString(var_2)
 		if err != nil {
 			return err
 		}
-		// Whitespace (normalised)
-		_, err = templBuffer.WriteString(` `)
+		_, err = templBuffer.WriteString(" ")
 		if err != nil {
 			return err
 		}
-		// If
 		if true {
-			// Text
 			var_3 := `So is this.`
 			_, err = templBuffer.WriteString(var_3)
 			if err != nil {
@@ -58,7 +53,6 @@ func WhitespaceIsAddedWithinTemplStatements() templ.Component {
 	})
 }
 
-// GoExpression
 const WhitespaceIsAddedWithinTemplStatementsExpected = `<p>This is some text. So is this.</p>`
 
 func InlineElementsAreNotPadded() templ.Component {
@@ -74,38 +68,28 @@ func InlineElementsAreNotPadded() templ.Component {
 			var_4 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<p>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_5 := `Inline text `
 		_, err = templBuffer.WriteString(var_5)
 		if err != nil {
 			return err
 		}
-		// Element (standard)
 		_, err = templBuffer.WriteString("<b>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_6 := `is spaced properly`
 		_, err = templBuffer.WriteString(var_6)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</b>")
+		_, err = templBuffer.WriteString("</b> ")
 		if err != nil {
 			return err
 		}
-		// Whitespace (normalised)
-		_, err = templBuffer.WriteString(` `)
-		if err != nil {
-			return err
-		}
-		// Text
 		var_7 := `without adding extra spaces.`
 		_, err = templBuffer.WriteString(var_7)
 		if err != nil {
@@ -122,7 +106,6 @@ func InlineElementsAreNotPadded() templ.Component {
 	})
 }
 
-// GoExpression
 const InlineElementsAreNotPaddedExpected = `<p>Inline text <b>is spaced properly</b> without adding extra spaces.</p>`
 
 func WhiteSpaceInHTMLIsNormalised() templ.Component {
@@ -138,34 +121,28 @@ func WhiteSpaceInHTMLIsNormalised() templ.Component {
 			var_8 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<p>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_9 := `newlines and other whitespace are stripped`
 		_, err = templBuffer.WriteString(var_9)
 		if err != nil {
 			return err
 		}
-		// Whitespace (normalised)
-		_, err = templBuffer.WriteString(` `)
+		_, err = templBuffer.WriteString(" ")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_10 := `but it is normalised`
 		_, err = templBuffer.WriteString(var_10)
 		if err != nil {
 			return err
 		}
-		// Whitespace (normalised)
-		_, err = templBuffer.WriteString(` `)
+		_, err = templBuffer.WriteString(" ")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_11 := `like HTML.`
 		_, err = templBuffer.WriteString(var_11)
 		if err != nil {
@@ -182,7 +159,6 @@ func WhiteSpaceInHTMLIsNormalised() templ.Component {
 	})
 }
 
-// GoExpression
 const WhiteSpaceInHTMLIsNormalisedExpected = `<p>newlines and other whitespace are stripped but it is normalised like HTML.</p>`
 
 func WhiteSpaceAroundValues() templ.Component {
@@ -198,29 +174,24 @@ func WhiteSpaceAroundValues() templ.Component {
 			var_12 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<p>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_13 := `templ allows `
 		_, err = templBuffer.WriteString(var_13)
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_14 string = "strings"
 		_, err = templBuffer.WriteString(templ.EscapeString(var_14))
 		if err != nil {
 			return err
 		}
-		// Whitespace (normalised)
-		_, err = templBuffer.WriteString(` `)
+		_, err = templBuffer.WriteString(" ")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_15 := `to be included in sentences.`
 		_, err = templBuffer.WriteString(var_15)
 		if err != nil {
@@ -237,5 +208,4 @@ func WhiteSpaceAroundValues() templ.Component {
 	})
 }
 
-// GoExpression
 const WhiteSpaceAroundValuesExpected = `<p>templ allows strings to be included in sentences.</p>`
diff --git a/generator/test-text/template_templ.go b/generator/test-text/template_templ.go
index 4a8a4383a..077ee32c0 100644
--- a/generator/test-text/template_templ.go
+++ b/generator/test-text/template_templ.go
@@ -22,69 +22,47 @@ func BasicTemplate(name string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
 		_, err = templBuffer.WriteString("<div>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_2 := `Name: `
 		_, err = templBuffer.WriteString(var_2)
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_3 string = name
 		_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
+		_, err = templBuffer.WriteString("</div><div>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_4 := `Text ` + "`" + `with backticks` + "`" + ``
 		_, err = templBuffer.WriteString(var_4)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</div>")
+		_, err = templBuffer.WriteString("</div><div>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_5 := `Text ` + "`" + `with backtick`
 		_, err = templBuffer.WriteString(var_5)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
+		_, err = templBuffer.WriteString("</div><div>")
 		if err != nil {
 			return err
 		}
-		// Text
 		var_6 := `Text ` + "`" + `with backtick alongside variable: `
 		_, err = templBuffer.WriteString(var_6)
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_7 string = name
 		_, err = templBuffer.WriteString(templ.EscapeString(var_7))
 		if err != nil {
diff --git a/generator/test-void/template_templ.go b/generator/test-void/template_templ.go
index 6c346ae8b..10a9a8b6b 100644
--- a/generator/test-void/template_templ.go
+++ b/generator/test-void/template_templ.go
@@ -22,32 +22,7 @@ func render() templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (void)
-		_, err = templBuffer.WriteString("<br>")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<img")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" src=\"https://example.com/image.png\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<br>")
-		if err != nil {
-			return err
-		}
-		// Element (void)
-		_, err = templBuffer.WriteString("<br>")
+		_, err = templBuffer.WriteString("<br><img src=\"https://example.com/image.png\"><br><br>")
 		if err != nil {
 			return err
 		}
diff --git a/storybook/_example/templates_templ.go b/storybook/_example/templates_templ.go
index c94ef2df6..1995a0617 100644
--- a/storybook/_example/templates_templ.go
+++ b/storybook/_example/templates_templ.go
@@ -9,7 +9,6 @@ import "context"
 import "io"
 import "bytes"
 
-// GoExpression
 import "fmt"
 import "time"
 
@@ -26,36 +25,16 @@ func headerTemplate(name string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<header")
+		_, err = templBuffer.WriteString("<header data-testid=\"headerTemplate\"><h1>")
 		if err != nil {
 			return err
 		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" data-testid=\"headerTemplate\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<h1>")
-		if err != nil {
-			return err
-		}
-		// StringExpression
 		var var_2 string = name
 		_, err = templBuffer.WriteString(templ.EscapeString(var_2))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</h1>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</header>")
+		_, err = templBuffer.WriteString("</h1></header>")
 		if err != nil {
 			return err
 		}
@@ -79,42 +58,21 @@ func footerTemplate() templ.Component {
 			var_3 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<footer")
+		_, err = templBuffer.WriteString("<footer data-testid=\"footerTemplate\"><div>")
 		if err != nil {
 			return err
 		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" data-testid=\"footerTemplate\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<div>")
-		if err != nil {
-			return err
-		}
-		// Text
 		var_4 := `&copy; `
 		_, err = templBuffer.WriteString(var_4)
 		if err != nil {
 			return err
 		}
-		// StringExpression
 		var var_5 string = fmt.Sprintf("%d", time.Now().Year())
 		_, err = templBuffer.WriteString(templ.EscapeString(var_5))
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</div>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</footer>")
+		_, err = templBuffer.WriteString("</div></footer>")
 		if err != nil {
 			return err
 		}
diff --git a/turbo/stream_templ.go b/turbo/stream_templ.go
index cd78057f8..6fa486cdd 100644
--- a/turbo/stream_templ.go
+++ b/turbo/stream_templ.go
@@ -22,17 +22,7 @@ func actionTemplate(action string, target string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<turbo-stream")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" action=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<turbo-stream action=\"")
 		if err != nil {
 			return err
 		}
@@ -40,15 +30,7 @@ func actionTemplate(action string, target string) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" target=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\" target=\"")
 		if err != nil {
 			return err
 		}
@@ -56,29 +38,15 @@ func actionTemplate(action string, target string) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
+		_, err = templBuffer.WriteString("\"><template>")
 		if err != nil {
 			return err
 		}
-		// Element (standard)
-		_, err = templBuffer.WriteString("<template>")
-		if err != nil {
-			return err
-		}
-		// Children
 		err = var_1.Render(ctx, templBuffer)
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("</template>")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</turbo-stream>")
+		_, err = templBuffer.WriteString("</template></turbo-stream>")
 		if err != nil {
 			return err
 		}
@@ -102,17 +70,7 @@ func removeTemplate(action string, target string) templ.Component {
 			var_2 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		// Element (standard)
-		_, err = templBuffer.WriteString("<turbo-stream")
-		if err != nil {
-			return err
-		}
-		// Element Attributes
-		_, err = templBuffer.WriteString(" action=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("<turbo-stream action=\"")
 		if err != nil {
 			return err
 		}
@@ -120,15 +78,7 @@ func removeTemplate(action string, target string) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(" target=")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("\"")
+		_, err = templBuffer.WriteString("\" target=\"")
 		if err != nil {
 			return err
 		}
@@ -136,15 +86,7 @@ func removeTemplate(action string, target string) templ.Component {
 		if err != nil {
 			return err
 		}
-		_, err = templBuffer.WriteString("\"")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString(">")
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</turbo-stream>")
+		_, err = templBuffer.WriteString("\"></turbo-stream>")
 		if err != nil {
 			return err
 		}