From 08e0d245a604380120de16db9e7806a1ccaf459d Mon Sep 17 00:00:00 2001
From: dpiercey <dpiercey@ebay.com>
Date: Sat, 1 Mar 2025 20:40:29 -0700
Subject: [PATCH] fix: avoid over registration of body content

---
 .changeset/light-worms-arrive.md              |   6 +
 .changeset/purple-crabs-brush.md              |   5 +
 .../helpers/tags-compat/runtime-html.js       | 120 +++++++++---------
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/custom-tag/index.js    |   7 +-
 .../__snapshots__/html.expected/template.js   |  13 +-
 .../__snapshots__/resume.expected.md          |   2 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../html.expected/tags/hello/index.js         |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |  19 ++-
 .../html.expected/tags/hello/index.js         |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/hello/index.js         |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/list/index.js          |   7 +-
 .../__snapshots__/html.expected/template.js   |  13 +-
 .../__snapshots__/resume.expected.md          |   2 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../html.expected/tags/hello/index.js         |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../at-tags/__snapshots__/resume.expected.md  |   2 +-
 .../at-tags/__snapshots__/ssr.expected.md     |   4 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/custom-tag.js          |   5 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/custom-tag.js          |   5 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/my-button.js           |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/my-button.js           |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/my-button.js           |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/my-button.js           |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/my-button.js           |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../dom.expected/template.hydrate.js          |  14 +-
 .../__snapshots__/dom.expected/template.js    |   2 +-
 .../html.expected/tags/my-button.js           |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../__snapshots__/resume.expected.md          |   8 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../html.expected/tags/counter.js             |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/comments.js            |   8 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../dom.expected/template.hydrate.js          |  11 +-
 .../__snapshots__/dom.expected/template.js    |   2 +-
 .../html.expected/tags/layout.js              |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../__snapshots__/resume.expected.md          |   2 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   7 +-
 .../__snapshots__/html.expected/template.js   |  13 +-
 .../__snapshots__/resume.expected.md          |   8 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../dom.expected/template.hydrate.js          |   9 +-
 .../__snapshots__/dom.expected/template.js    |   2 +-
 .../__snapshots__/html.expected/tags/child.js |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../__snapshots__/resume.expected.md          |   8 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/tags/child.js |   7 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/resume.expected.md          |   8 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/csr.expected.md             |  12 +-
 .../html.expected/tags/FancyButton.js         |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../__snapshots__/resume.expected.md          |  24 ++--
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/counter.js             |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../tags/display-intersection.js              |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/counter.js             |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/checkbox.js            |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/checkbox.js            |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../dom.expected/template.hydrate.js          |  13 +-
 .../__snapshots__/dom.expected/template.js    |   2 +-
 .../html.expected/tags/my-let.js              |   5 +-
 .../html.expected/tags/my-tag.js              |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../__snapshots__/resume.expected.md          |   8 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../html.expected/tags/custom-tag.js          |   5 +-
 .../html.expected/tags/custom-tag.js          |   5 +-
 .../html.expected/tags/hello/index.js         |   5 +-
 .../html.expected/tags/message.js             |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/custom-tag.js          |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../__snapshots__/resume.expected.md          |   8 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../html.expected/tags/custom-tag.js          |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../__snapshots__/resume.expected.md          |   8 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../html.expected/tags/custom-tag.js          |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../__snapshots__/resume.expected.md          |   8 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../dom.expected/template.hydrate.js          |   3 +-
 .../__snapshots__/dom.expected/template.js    |   2 +-
 .../html.expected/tags/child/index.js         |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../__snapshots__/resume.expected.md          |   2 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/hello.js      |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/counter.js             |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/csr.expected.md             |   6 -
 .../dom.expected/template.hydrate.js          |   4 +-
 .../__snapshots__/dom.expected/template.js    |   2 +-
 .../__snapshots__/html.expected/tags/child.js |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../__snapshots__/resume.expected.md          |  18 +--
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/dom.expected/template.js    |   2 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../dom.expected/template.hydrate.js          |  24 +---
 .../__snapshots__/dom.expected/template.js    |   2 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/resume.expected.md          |   8 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../dom.expected/template.hydrate.js          |  16 +--
 .../__snapshots__/dom.expected/template.js    |   2 +-
 .../html.expected/tags/custom-tag.js          |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../__snapshots__/resume.expected.md          |   4 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../html.expected/tags/custom-tag.js          |   5 +-
 .../__snapshots__/html.expected/template.js   |   7 +-
 .../__snapshots__/resume.expected.md          |   8 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../html.expected/tags/custom-tag.js          |   5 +-
 .../__snapshots__/html.expected/template.js   |   7 +-
 .../__snapshots__/resume.expected.md          |   8 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   7 +-
 .../__snapshots__/resume.expected.md          |   6 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../html.expected/tags/child1.js              |   5 +-
 .../html.expected/tags/child2.js              |   5 +-
 .../__snapshots__/html.expected/template.js   |   7 +-
 .../__snapshots__/resume.expected.md          |   6 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../html.expected/tags/tag-a/index.js         |   7 +-
 .../html.expected/tags/tag-b/index.js         |   7 +-
 .../__snapshots__/html.expected/template.js   |  47 ++++---
 .../__snapshots__/resume.expected.md          |   2 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/custom-tag.js          |   5 +-
 .../__snapshots__/html.expected/template.js   |   7 +-
 .../__snapshots__/resume.expected.md          |   8 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../html.expected/tags/counter.js             |   5 +-
 .../__snapshots__/html.expected/template.js   |   7 +-
 .../__snapshots__/resume.expected.md          |  10 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../html.expected/tags/child/index.js         |   5 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../html.expected/tags/counter.js             |   5 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/html.expected/tags/child.js |   3 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/tags/thing.js |   7 +-
 .../__snapshots__/html.expected/template.js   |   9 +-
 .../__snapshots__/resume.expected.md          |   2 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../dom.expected/template.hydrate.js          |  25 ++--
 .../__snapshots__/dom.expected/template.js    |   4 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/tags/thing.js |   9 +-
 .../__snapshots__/html.expected/template.js   |  25 ++--
 .../__snapshots__/resume.expected.md          |   2 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/tags/thing.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../dom.expected/template.hydrate.js          |  30 ++---
 .../__snapshots__/dom.expected/template.js    |   4 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/tags/thing.js |   9 +-
 .../__snapshots__/html.expected/template.js   |  31 +++--
 .../__snapshots__/resume.expected.md          |   2 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/resume.expected.md          |   2 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/tags/thing.js |   5 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/resume.expected.md          |   2 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../dom.expected/template.hydrate.js          |  12 +-
 .../__snapshots__/dom.expected/template.js    |   4 +-
 .../__snapshots__/html.expected/tags/child.js |   9 +-
 .../__snapshots__/html.expected/template.js   |  25 ++--
 .../__snapshots__/resume.expected.md          |   2 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/parent-el.js           |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/baz.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/baz.js   |   5 +-
 .../__snapshots__/html.expected/tags/foo.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   7 +-
 .../__snapshots__/resume.expected.md          |   2 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/tags/baz.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/2counters.js           |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |  23 ++--
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/hello-setter.js        |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |  17 ++-
 .../__snapshots__/resume.expected.md          |  12 +-
 .../__snapshots__/ssr.expected.md             |   4 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/Bar.js   |   5 +-
 .../__snapshots__/html.expected/tags/foo.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   7 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/tags/counter.js             |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |  13 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../__snapshots__/html.expected/tags/child.js |   5 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 packages/runtime-tags/src/common/helpers.ts   |   2 +-
 packages/runtime-tags/src/dom/control-flow.ts |  18 +--
 packages/runtime-tags/src/html.ts             |   5 +-
 packages/runtime-tags/src/html/compat.ts      |   3 +
 packages/runtime-tags/src/html/dynamic-tag.ts |  28 +++-
 packages/runtime-tags/src/html/template.ts    |   8 +-
 .../src/translator/core/define.ts             |  12 +-
 .../src/translator/util/references.ts         |   2 +-
 .../src/translator/util/sections.ts           |   6 +
 .../src/translator/util/translate-attrs.ts    |  32 +++--
 .../src/translator/visitors/program/dom.ts    |   4 +-
 .../src/translator/visitors/program/html.ts   |  62 +++++----
 .../src/translator/visitors/program/index.ts  |   8 +-
 .../src/translator/visitors/tag/custom-tag.ts |  12 +-
 .../translator/visitors/tag/dynamic-tag.ts    |   2 +-
 .../__snapshots__/html.expected/tags/hello.js |   5 +-
 .../html.expected/components/custom-tag.js    |   7 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 .../html.expected/components/tags-counter.js  |   5 +-
 .../__snapshots__/html.expected/template.js   |   7 +-
 .../__snapshots__/html.expected/tags/hello.js |   7 +-
 .../html.expected/components/tags-counter.js  |   5 +-
 .../__snapshots__/html.expected/template.js   |   7 +-
 .../html.expected/components/tags-layout.js   |   7 +-
 .../html.expected/components/tags-layout.js   |   7 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../html.expected/components/tags-layout.js   |   7 +-
 .../__snapshots__/html.expected/template.js   |  11 +-
 .../__snapshots__/html.expected/template.js   |   5 +-
 436 files changed, 1294 insertions(+), 1647 deletions(-)
 create mode 100644 .changeset/light-worms-arrive.md
 create mode 100644 .changeset/purple-crabs-brush.md

diff --git a/.changeset/light-worms-arrive.md b/.changeset/light-worms-arrive.md
new file mode 100644
index 0000000000..ada9b5b54d
--- /dev/null
+++ b/.changeset/light-worms-arrive.md
@@ -0,0 +1,6 @@
+---
+"@marko/translator-interop-class-tags": patch
+"marko": patch
+---
+
+Update tags api interop layer.
diff --git a/.changeset/purple-crabs-brush.md b/.changeset/purple-crabs-brush.md
new file mode 100644
index 0000000000..dac02aadfe
--- /dev/null
+++ b/.changeset/purple-crabs-brush.md
@@ -0,0 +1,5 @@
+---
+"@marko/runtime-tags": patch
+---
+
+Avoid registering body content when known downstream usage is not serialized.
diff --git a/packages/runtime-class/src/runtime/helpers/tags-compat/runtime-html.js b/packages/runtime-class/src/runtime/helpers/tags-compat/runtime-html.js
index 00c044ea2a..74370f8343 100644
--- a/packages/runtime-class/src/runtime/helpers/tags-compat/runtime-html.js
+++ b/packages/runtime-class/src/runtime/helpers/tags-compat/runtime-html.js
@@ -7,8 +7,8 @@ const defaultCreateOut = require("../../createOut");
 const dynamicTag5 = require("../dynamic-tag");
 
 exports.p = function (htmlCompat) {
-  const isMarko6 = (fn) => !!fn.___isTagsAPI;
-  const isMarko5 = (fn) => !fn.___isTagsAPI;
+  const isMarko6 = (fn) => htmlCompat.isTagsAPI(fn);
+  const isMarko5 = (fn) => !isMarko6(fn);
   const writeHTML = (result) => {
     const state = result.out._state;
     const writer = state.writer;
@@ -63,77 +63,71 @@ exports.p = function (htmlCompat) {
     {},
   );
 
-  htmlCompat.patchDynamicTag(
-    function getRenderer(tag) {
-      const renderer = tag._ || tag.renderBody || tag;
-      if (isMarko6(renderer)) return renderer;
+  htmlCompat.patchDynamicTag(function getRenderer(tag) {
+    const renderer = tag._ || tag.renderBody || tag;
+    if (isMarko6(renderer)) return renderer;
 
-      const renderer5 =
-        tag._ ||
-        tag.render ||
-        (tag.renderer && tag.renderer.renderer) ||
-        tag.renderer;
-      const renderBody5 = tag.renderBody || tag;
+    const renderer5 =
+      tag._ ||
+      tag.render ||
+      (tag.renderer && tag.renderer.renderer) ||
+      tag.renderer;
+    const renderBody5 = tag.renderBody || tag;
 
-      if (!renderer5 && renderBody5) {
-        htmlCompat.registerRenderBody(renderBody5);
-      }
-      return (input, ...args) => {
-        const out = defaultCreateOut();
-        let customEvents;
-
-        if (renderer5) {
-          const normalizedInput = {};
-
-          for (const key in input) {
-            const value = input[key];
-            if (/^on[-A-Z]/.test(key)) {
-              if (typeof value === "function") {
-                (customEvents || (customEvents = [])).push([
-                  key[2] === "-" ? key.slice(3) : key.slice(2).toLowerCase(),
-                  value,
-                ]);
-                value.toJSON = htmlCompat.toJSON;
-              }
-            } else {
-              normalizedInput[key === "content" ? "renderBody" : key] = value;
+    if (!renderer5 && renderBody5) {
+      htmlCompat.registerRenderBody(renderBody5);
+    }
+    return (input, ...args) => {
+      const out = defaultCreateOut();
+      let customEvents;
+
+      if (renderer5) {
+        const normalizedInput = {};
+
+        for (const key in input) {
+          const value = input[key];
+          if (/^on[-A-Z]/.test(key)) {
+            if (typeof value === "function") {
+              (customEvents || (customEvents = [])).push([
+                key[2] === "-" ? key.slice(3) : key.slice(2).toLowerCase(),
+                value,
+              ]);
+              value.toJSON = htmlCompat.toJSON;
             }
+          } else {
+            normalizedInput[key === "content" ? "renderBody" : key] = value;
           }
-          renderer5(normalizedInput, out);
-        } else {
-          renderBody5(out, input, ...args);
         }
+        renderer5(normalizedInput, out);
+      } else {
+        renderBody5(out, input, ...args);
+      }
 
-        const componentsContext = ___getComponentsContext(out);
-        const component = componentsContext.___components[0];
-        if (component) {
-          component.___component.___customEvents = customEvents;
-          htmlCompat.writeSetScopeForComponent(component.id);
-        }
+      const componentsContext = ___getComponentsContext(out);
+      const component = componentsContext.___components[0];
+      if (component) {
+        component.___component.___customEvents = customEvents;
+        htmlCompat.writeSetScopeForComponent(component.id);
+      }
 
-        initComponentsTag({}, out);
+      initComponentsTag({}, out);
 
-        let async;
-        out.once("finish", (result) => {
-          if (!async) {
-            async = false;
-            writeHTML(result);
-          }
-        });
+      let async;
+      out.once("finish", (result) => {
+        if (!async) {
+          async = false;
+          writeHTML(result);
+        }
+      });
 
-        out.end();
+      out.end();
 
-        if (async !== false) {
-          async = true;
-          htmlCompat.fork(out, writeHTML);
-        }
-      };
-    },
-    function createRenderer(renderFn) {
-      renderFn.___isTagsAPI = true;
-      return renderFn;
-    },
-  );
+      if (async !== false) {
+        async = true;
+        htmlCompat.fork(out, writeHTML);
+      }
+    };
+  });
 
   return htmlCompat.registerRenderer;
 };
diff --git a/packages/runtime-tags/src/__tests__/fixtures/abort-signal-render-phase-error/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/abort-signal-render-phase-error/__snapshots__/html.expected/template.js
index 9546b27064..bb894d811c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/abort-signal-render-phase-error/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/abort-signal-render-phase-error/__snapshots__/html.expected/template.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div>${_$.escapeXML((() => {
     throw new Error("Cannot use $signal in a server render.");
   })().onabort = () => {})}</div>`);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assign-to-owner-closure/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/assign-to-owner-closure/__snapshots__/html.expected/template.js
index 53a3ac84ae..df5cb61c98 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assign-to-owner-closure/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/assign-to-owner-closure/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const hide = undefined;
@@ -20,5 +20,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     "#text/0!": _$.getScopeById(_ifScopeId)
   }, "__tests__/template.marko", 0);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/assignment-before-tag-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/assignment-before-tag-var/__snapshots__/html.expected/template.js
index 9cde14d56e..a9316296a9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/assignment-before-tag-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/assignment-before-tag-var/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   const lastClickCount = undefined;
@@ -11,5 +11,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "6:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/tags/custom-tag/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/tags/custom-tag/index.js
index fccdfbc557..e4951a029e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/tags/custom-tag/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/tags/custom-tag/index.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag/index.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     thing: {
@@ -12,7 +12,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.write(`<div>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/1")}</div>`);
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(content)
+    "#text/0(": _$.dynamicTagId(content)
   }, "__tests__/tags/custom-tag/index.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag/index.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js
index 7f9d88d804..a198e954a1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _customTag from "./tags/custom-tag/index.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     x
@@ -10,18 +10,18 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   if (x) {
     _thing = _$.attrTag({
       x: 1,
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: _$.registerContent("__tests__/template.marko_1_renderer", () => {
         const _scope1_id = _$.nextScopeId();
         _$.write("Hello");
-      }), "__tests__/template.marko_1_renderer", _scope0_id)
+      }, _scope0_id)
     });
   } else {
     _thing = _$.attrTag({
       x: 2,
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: _$.registerContent("__tests__/template.marko_2_renderer", () => {
         const _scope2_id = _$.nextScopeId();
         _$.write("Goodbye");
-      }), "__tests__/template.marko_2_renderer", _scope0_id)
+      }, _scope0_id)
     });
   }
   _customTag({
@@ -30,5 +30,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     "#childScope/0": _$.writeExistingScope(_childScope)
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/resume.expected.md
index 33141792c6..70ea1e3cd0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/resume.expected.md
@@ -12,7 +12,7 @@
       <!--M_*2 #text/1-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={"#childScope/0":_.b={"#text/0!":_.c={}}},2:_.b,3:_.c},_.b["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),0]
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:{"#childScope/0":_.a={"#text/0!":_.b={},"#text/0(":"__tests__/template.marko_1_renderer"}},2:_.a,3:_.b}),0]
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/ssr.expected.md
index c4bb510683..794c65db31 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[3-->Hello<!--M_]2 #text/0--><div>1<!--M_*2 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={"#childScope/0":_.b={"#text/0!":_.c={}}},2:_.b,3:_.c},_.b["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),0]</script>
+  <!--M_[3-->Hello<!--M_]2 #text/0--><div>1<!--M_*2 #text/1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:{"#childScope/0":_.a={"#text/0!":_.b={},"#text/0(":"__tests__/template.marko_1_renderer"}},2:_.a,3:_.b}),0]</script>
 ```
 
 # Render End
@@ -16,7 +16,7 @@
       <!--M_*2 #text/1-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={"#childScope/0":_.b={"#text/0!":_.c={}}},2:_.b,3:_.c},_.b["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),0]
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:{"#childScope/0":_.a={"#text/0!":_.b={},"#text/0(":"__tests__/template.marko_1_renderer"}},2:_.a,3:_.b}),0]
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/tags/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/tags/hello/index.js
index 19b4f85875..be358f81a1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/tags/hello/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/tags/hello/index.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div></div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/template.js
index 175db06ee5..4341a154db 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/template.js
@@ -1,7 +1,6 @@
 import _hello from "./tags/hello/index.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _hello({});
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-tag-parent/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-tag-parent/__snapshots__/html.expected/template.js
index 0b426b81af..3e03321f1d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-tag-parent/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-tag-parent/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     x
@@ -8,25 +8,24 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.dynamicTagInput(_scope0_id, "#text/0", x, {
     footer: _$.attrTag({
       class: "my-footer",
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: _$.registerContent("__tests__/template.marko_3_renderer", () => {
         const _scope3_id = _$.nextScopeId();
         _$.write("Footer content");
-      }), "__tests__/template.marko_3_renderer", _scope0_id)
+      }, _scope0_id)
     }),
     header: _$.attrTag({
       class: "my-header",
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: _$.registerContent("__tests__/template.marko_2_renderer", () => {
         const _scope2_id = _$.nextScopeId();
         _$.write("Header content");
-      }), "__tests__/template.marko_2_renderer", _scope0_id)
+      }, _scope0_id)
     })
-  }, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  }, _$.registerContent("__tests__/template.marko_1_renderer", () => {
     const _scope1_id = _$.nextScopeId();
     _$.write("Body content");
-  }), "__tests__/template.marko_1_renderer", _scope0_id));
+  }, _scope0_id));
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(x)
+    "#text/0(": _$.dynamicTagId(x)
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/tags/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/tags/hello/index.js
index 19b4f85875..be358f81a1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/tags/hello/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/tags/hello/index.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div></div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/template.js
index 988d0a14e8..e91ce71bb8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/template.js
@@ -1,10 +1,9 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _hello from "./tags/hello/index.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     x
   } = input;
   _hello({});
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/tags/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/tags/hello/index.js
index 19b4f85875..be358f81a1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/tags/hello/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/tags/hello/index.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div></div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/template.js
index a75cb75057..3dc055ce2b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/template.js
@@ -1,7 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _hello from "./tags/hello/index.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _hello({});
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/html.expected/tags/list/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/html.expected/tags/list/index.js
index 882f39af9c..cf4713d46d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/html.expected/tags/list/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/html.expected/tags/list/index.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/list/index.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   _$.resumeSingleNodeForOf(input.item, (item, _index) => {
@@ -9,11 +9,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _scope1_.set(_index, _$.ensureScopeWithId(_scope1_id));
     _$.writeScope(_scope1_id, {
       "#text/0!": _$.writeExistingScope(_dynamicScope),
-      "#text/0(": _$.normalizeDynamicRenderer(item.content)
+      "#text/0(": _$.dynamicTagId(item.content)
     }, "__tests__/tags/list/index.marko", "1:1");
   }, _scope0_id, "#text/0");
   _$.writeScope(_scope0_id, {
     "#text/0(": _scope1_.size ? _scope1_ : undefined
   }, "__tests__/tags/list/index.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/list/index.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/html.expected/template.js
index a8197dd379..bf45626274 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/html.expected/template.js
@@ -1,19 +1,18 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _list from "./tags/list/index.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _list({
     item: _$.attrTags(_$.attrTag({
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: _$.registerContent("__tests__/template.marko_1_renderer", () => {
         const _scope1_id = _$.nextScopeId();
         _$.write("Hello");
-      }), "__tests__/template.marko_1_renderer", _scope0_id)
+      }, _scope0_id)
     }), {
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: _$.registerContent("__tests__/template.marko_2_renderer", () => {
         const _scope2_id = _$.nextScopeId();
         _$.write("Again");
-      }), "__tests__/template.marko_2_renderer", _scope0_id)
+      }, _scope0_id)
     })
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/resume.expected.md
index f9f3d12735..2519fb595b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     <!--M_]5 #text/0-->
     <!--M_|2 #text/0 5 3-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.g={2:{"#text/0(":new Map(_.a=[[0,_.c={"#text/0!":_.d={},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.b={})}],[1,_.e={"#text/0!":_.f={},"#text/0(":_._["__tests__/template.marko_2_renderer"](_.b)}]])},3:_.c,4:_.d,5:_.e,6:_.f}),0]
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={2:{"#text/0(":new Map(_.a=[[0,_.b={"#text/0!":_.c={},"#text/0(":"__tests__/template.marko_1_renderer"}],[1,_.d={"#text/0!":_.e={},"#text/0(":"__tests__/template.marko_2_renderer"}]])},3:_.b,4:_.c,5:_.d,6:_.e}),0]
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/ssr.expected.md
index f2c6e41902..b166fe56f7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-static-repeated/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[4-->Hello<!--M_]3 #text/0--><!--M_[6-->Again<!--M_]5 #text/0--><!--M_|2 #text/0 5 3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.g={2:{"#text/0(":new Map(_.a=[[0,_.c={"#text/0!":_.d={},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.b={})}],[1,_.e={"#text/0!":_.f={},"#text/0(":_._["__tests__/template.marko_2_renderer"](_.b)}]])},3:_.c,4:_.d,5:_.e,6:_.f}),0]</script>
+  <!--M_[4-->Hello<!--M_]3 #text/0--><!--M_[6-->Again<!--M_]5 #text/0--><!--M_|2 #text/0 5 3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.f={2:{"#text/0(":new Map(_.a=[[0,_.b={"#text/0!":_.c={},"#text/0(":"__tests__/template.marko_1_renderer"}],[1,_.d={"#text/0!":_.e={},"#text/0(":"__tests__/template.marko_2_renderer"}]])},3:_.b,4:_.c,5:_.d,6:_.e}),0]</script>
 ```
 
 # Render End
@@ -16,7 +16,7 @@
     <!--M_]5 #text/0-->
     <!--M_|2 #text/0 5 3-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.g={2:{"#text/0(":new Map(_.a=[[0,_.c={"#text/0!":_.d={},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.b={})}],[1,_.e={"#text/0!":_.f={},"#text/0(":_._["__tests__/template.marko_2_renderer"](_.b)}]])},3:_.c,4:_.d,5:_.e,6:_.f}),0]
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={2:{"#text/0(":new Map(_.a=[[0,_.b={"#text/0!":_.c={},"#text/0(":"__tests__/template.marko_1_renderer"}],[1,_.d={"#text/0!":_.e={},"#text/0(":"__tests__/template.marko_2_renderer"}]])},3:_.b,4:_.c,5:_.d,6:_.e}),0]
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/tags/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/tags/hello/index.js
index ee70d66a8e..97c9b5bedc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/tags/hello/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/tags/hello/index.js
@@ -1,11 +1,10 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", input.foo, {});
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(input.foo)
+    "#text/0(": _$.dynamicTagId(input.foo)
   }, "__tests__/tags/hello/index.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/template.js
index d0e76f12a8..49d542b5fc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/template.js
@@ -1,14 +1,13 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _hello from "./tags/hello/index.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _hello({
     foo: _$.attrTag({
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: _$.registerContent("__tests__/template.marko_1_renderer", () => {
         const _scope1_id = _$.nextScopeId();
         _$.write("Foo!");
-      }), "__tests__/template.marko_1_renderer", _scope0_id)
+      }, _scope0_id)
     })
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/resume.expected.md
index 1c3b76cd34..61e60214ce 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/resume.expected.md
@@ -7,7 +7,7 @@
     Foo!
     <!--M_]2 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{"#text/0!":_.b={},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a={})},3:_.b}),0]
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={2:{"#text/0!":_.a={},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.a}),0]
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/ssr.expected.md
index ffde9c3025..0686f6467c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[3-->Foo!<!--M_]2 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={2:{"#text/0!":_.b={},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a={})},3:_.b}),0]</script>
+  <!--M_[3-->Foo!<!--M_]2 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={2:{"#text/0!":_.a={},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.a}),0]</script>
 ```
 
 # Render End
@@ -12,7 +12,7 @@
     Foo!
     <!--M_]2 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{"#text/0!":_.b={},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a={})},3:_.b}),0]
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={2:{"#text/0!":_.a={},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.a}),0]
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/html.expected/template.js
index 8338f8a40b..29fb9bb109 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/attr-boolean-dynamic/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const disabled = true;
   _$.write(`<input${_$.attr("disabled", disabled)}>${_$.markResumeNode(_scope0_id, "#input/0")}<button>${_$.escapeXML(disabled ? "enable" : "disable")}${_$.markResumeNode(_scope0_id, "#text/2")}</button>${_$.markResumeNode(_scope0_id, "#button/1")}`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     disabled: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-boolean/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/attr-boolean/__snapshots__/html.expected/template.js
index 29f847fbdf..977f235849 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/attr-boolean/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/attr-boolean/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<input checked>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/tags/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/tags/custom-tag.js
index fa59ae5db8..3683827dcd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/tags/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/tags/custom-tag.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     class: className
   } = input;
   _$.write(`<div${_$.classAttr(className)}></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/template.js
index 217c5fe6fe..35daf139c7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _customTag from "./tags/custom-tag.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     c,
@@ -31,10 +31,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
         b: c,
         d
       }],
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: _$.registerContent("__tests__/template.marko_1_renderer", () => {
         const _scope1_id = _$.nextScopeId();
         _$.write("Hello");
-      }), "__tests__/template.marko_1_renderer", _scope0_id)
+      }, _scope0_id)
     })
   });
   _$.writeScope(_scope0_id, {
@@ -43,11 +43,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     d,
     "#childScope/1": _$.writeExistingScope(_childScope),
     "#text/3!": _$.writeExistingScope(_dynamicScope),
-    "#text/3(": _$.normalizeDynamicRenderer(input.test)
+    "#text/3(": _$.dynamicTagId(input.test)
   }, "__tests__/template.marko", 0, {
     input_test: ["input.test"],
     c: "2:10",
     d: "2:13"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-escape/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/attr-escape/__snapshots__/html.expected/template.js
index 27962c067a..7814404f55 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/attr-escape/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/attr-escape/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div${_$.classAttr(input.foo)}${_$.attr("foo", 'a' + input.foo + 'b')}${_$.attr("bar", `a ${input.bar} b`)}${_$.attr("nested", `a ${input.foo + ` nested ${input.bar}`} b`)}></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
   _$.writeScope(_scope0_id, {
@@ -9,5 +9,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     input_foo: ["input.foo"],
     input_bar: ["input.bar"]
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-falsey/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/attr-falsey/__snapshots__/html.expected/template.js
index fe33d8322c..413897a518 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/attr-falsey/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/attr-falsey/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div d=0 y=1></div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/tags/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/tags/custom-tag.js
index 8f7874f382..c293a42300 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/tags/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/tags/custom-tag.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     style
   } = input;
   _$.write(`<div${_$.styleAttr(style)}></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/template.js
index 60eb5c3862..f917ff252a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _customTag from "./tags/custom-tag.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     color,
@@ -32,16 +32,15 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
       style: {
         color: "green"
       },
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: _$.registerContent("__tests__/template.marko_1_renderer", () => {
         const _scope1_id = _$.nextScopeId();
         _$.write("Hello");
-      }), "__tests__/template.marko_1_renderer", _scope0_id)
+      }, _scope0_id)
     })
   });
   _$.writeScope(_scope0_id, {
     "#childScope/1": _$.writeExistingScope(_childScope),
     "#text/4!": _$.writeExistingScope(_dynamicScope),
-    "#text/4(": _$.normalizeDynamicRenderer(test)
+    "#text/4(": _$.dynamicTagId(test)
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-template-literal-escape/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/attr-template-literal-escape/__snapshots__/html.expected/template.js
index 3a314485ed..5bd71d7114 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/attr-template-literal-escape/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/attr-template-literal-escape/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div${_$.attr("foo", `Hello ${input.name}`)}></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/html.expected/template.js
index 4b2d29e23e..49c5a74257 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/await-tag/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import { resolveAfter } from "../../utils/resolve";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write("<div>");
@@ -39,5 +39,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "3:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-chain/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-chain/__snapshots__/html.expected/template.js
index 0468fbcdf9..d94b3d5645 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-chain/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-chain/__snapshots__/html.expected/template.js
@@ -1,10 +1,9 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const y = x * 2;
   const z = y * 3;
   _$.write(`<div>${_$.escapeXML(z)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/tags/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/tags/my-button.js
index ae9bae5440..5a5b9f0387 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/tags/my-button.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/tags/my-button.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     onClick,
@@ -12,5 +12,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/my-button.marko", 0, {
     onClick: "1:10"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/template.js
index 40191f05e8..4dc899b2b1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _myButton from "./tags/my-button.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   const _childScope = _$.peekNextScope();
@@ -17,5 +17,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/tags/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/tags/my-button.js
index d5f243192d..3d83fdd383 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/tags/my-button.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/tags/my-button.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const attrs = input;
   const {
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/my-button.marko", 0, {
     onClick: "3:10"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/template.js
index 40191f05e8..4dc899b2b1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _myButton from "./tags/my-button.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   const _childScope = _$.peekNextScope();
@@ -17,5 +17,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/tags/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/tags/my-button.js
index c072133790..984e3eaa6a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/tags/my-button.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/tags/my-button.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     onClick,
@@ -19,5 +19,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/my-button.marko", 0, {
     onClick: "1:10"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/template.js
index bef75a761d..836249456c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _myButton from "./tags/my-button.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   const _childScope = _$.peekNextScope();
@@ -29,5 +29,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/tags/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/tags/my-button.js
index 646e635fad..ddda8e559f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/tags/my-button.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/tags/my-button.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     onClick,
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/my-button.marko", 0, {
     onClick: "1:10"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/template.js
index 40191f05e8..4dc899b2b1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _myButton from "./tags/my-button.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   const _childScope = _$.peekNextScope();
@@ -17,5 +17,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/tags/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/tags/my-button.js
index ae9bae5440..5a5b9f0387 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/tags/my-button.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/tags/my-button.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     onClick,
@@ -12,5 +12,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/my-button.marko", 0, {
     onClick: "1:10"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/template.js
index 40191f05e8..4dc899b2b1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _myButton from "./tags/my-button.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   const _childScope = _$.peekNextScope();
@@ -17,5 +17,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.hydrate.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.hydrate.js
index 81c56764c1..3e50198c4d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.hydrate.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.hydrate.js
@@ -1,4 +1,4 @@
-// size: 310 (min) 181 (brotli)
+// size: 258 (min) 177 (brotli)
 const _onClick__effect = _$.effect("a0", (_scope, { 4: onClick }) =>
     _$.on(_scope[0], "click", onClick),
   ),
@@ -7,13 +7,11 @@ const _onClick__effect = _$.effect("a0", (_scope, { 4: onClick }) =>
     "b2",
     1,
     (_scope, clickCount) => _$.data(_scope[0], clickCount),
-  );
-_$.registerContent("b1", " ", " ", (_scope) => {
-  _clickCount$myButton_content._(_scope);
-});
-const _clickCount = _$.state(1, (_scope, clickCount) => {
-  _onClick_(_scope[0], _onClick(_scope)), _clickCount$myButton_content(_scope);
-});
+  ),
+  _clickCount = _$.state(1, (_scope, clickCount) => {
+    _onClick_(_scope[0], _onClick(_scope)),
+      _clickCount$myButton_content(_scope);
+  });
 function _onClick(_scope, { 1: clickCount } = _scope) {
   return function () {
     _clickCount(_scope, clickCount + 1);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.js
index 3bb550a9d5..4155f801fe 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.js
@@ -6,7 +6,7 @@ const _clickCount$myButton_content = _$.registerDynamicClosure("__tests__/templa
 const _setup$myButton_content = _scope => {
   _clickCount$myButton_content._(_scope);
 };
-const _myButton_content = _$.registerContent("__tests__/template.marko_1_renderer", " ", /* get */" ", _setup$myButton_content);
+const _myButton_content = /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", " ", /* get */" ", _setup$myButton_content);
 const _clickCount = /* @__PURE__ */_$.state("clickCount/1", (_scope, clickCount) => {
   _myButton_input_onClick(_scope["#childScope/0"], _onClick(_scope));
   _clickCount$myButton_content(_scope);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/tags/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/tags/my-button.js
index b555023bb1..309f1a7571 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/tags/my-button.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/tags/my-button.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     onClick,
@@ -13,9 +13,8 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     onClick,
     "#text/1!": _$.writeExistingScope(_dynamicScope),
-    "#text/1(": _$.normalizeDynamicRenderer(content)
+    "#text/1(": _$.dynamicTagId(content)
   }, "__tests__/tags/my-button.marko", 0, {
     onClick: "1:10"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js
index a6d5ba34cf..341061072d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _myButton from "./tags/my-button.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   const _childScope = _$.peekNextScope();
@@ -8,7 +8,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     onClick: _$.register(function () {
       clickCount++;
     }, "__tests__/template.marko_0/onClick", _scope0_id),
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       _$.write(`${_$.escapeXML(clickCount)}${_$.markResumeNode(_scope1_id, "#text/0")}`);
       _$.writeEffect(_scope1_id, "__tests__/template.marko_1_clickCount/subscriber");
@@ -16,7 +16,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
         _: _$.ensureScopeWithId(_scope0_id)
       }, "__tests__/template.marko", "2:2");
       _$.resumeClosestBranch(_scope1_id);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   });
   _$.writeScope(_scope0_id, {
     clickCount,
@@ -25,5 +25,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md
index 1ed945ee00..7ebac64c15 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     </button>
     <!--M_*2 #button/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},2:_.b,3:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.b,3:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.d),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
     </script>
   </body>
 </html>
@@ -34,7 +34,7 @@ container.querySelector("button").click();
     </button>
     <!--M_*2 #button/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},2:_.b,3:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.b,3:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.d),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
     </script>
   </body>
 </html>
@@ -61,7 +61,7 @@ container.querySelector("button").click();
     </button>
     <!--M_*2 #button/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},2:_.b,3:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.b,3:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.d),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
     </script>
   </body>
 </html>
@@ -88,7 +88,7 @@ container.querySelector("button").click();
     </button>
     <!--M_*2 #button/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},2:_.b,3:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.b,3:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.d),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md
index eb73d747a9..248338d49d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button><!--M_[3-->0<!--M_*3 #text/0--><!--M_]2 #text/1--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},2:_.b,3:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>
+  <button><!--M_[3-->0<!--M_*3 #text/0--><!--M_]2 #text/1--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.b,3:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.d),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>
 ```
 
 # Render End
@@ -16,7 +16,7 @@
     </button>
     <!--M_*2 #button/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},2:_.b,3:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.b,3:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.d),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/tags/counter.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/tags/counter.js
index 66f79d42c3..333321bd21 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/tags/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/tags/counter.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   _$.write(`<button>${_$.escapeXML(clickCount)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/template.js
index 28c01757cb..2a7182d820 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/template.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _counter from "./tags/counter.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div>");
   _counter({});
   _$.write("</div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/html.expected/template.js
index 3534c4018d..8079425706 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter-multiple-nodes/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const show = true;
@@ -28,5 +28,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/html.expected/template.js
index c7b03bc8c9..3d969ac6ce 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-conditional-counter/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const show = true;
@@ -28,5 +28,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/html.expected/template.js
index a149b34025..9ec458622e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-converge-in-if/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId;
   const a = 0;
@@ -21,5 +21,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     b: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/html.expected/template.js
index d13e894422..53cf6625c4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-counter-const-event-handler/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   const increment = _$.register(function () {
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     increment: "2:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/html.expected/template.js
index 4e1c70820c..919be43c08 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-counter-multiplier/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   const multiplier = 1;
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     multiplier: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/html.expected/template.js
index da929b4303..bb8a789b8e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-counter/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   _$.write(`<div><button>${_$.escapeXML(clickCount)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}</div>`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "2:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/html.expected/template.js
index a68c10b683..1bde7124fe 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-dynamic-native-tag/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     tagName
@@ -7,13 +7,12 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", tagName, {
     class: ["a", "b"]
-  }, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  }, _$.registerContent("__tests__/template.marko_1_renderer", () => {
     const _scope1_id = _$.nextScopeId();
     _$.write("Hello World");
-  }), "__tests__/template.marko_1_renderer", _scope0_id));
+  }, _scope0_id));
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(tagName)
+    "#text/0(": _$.dynamicTagId(tagName)
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/html.expected/template.js
index 1334af8bd1..7a8cd4263d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-effect-no-deps/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/html.expected/template.js
index faa6e2fe0a..5dd6899466 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-execution-order/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const message = {
@@ -27,5 +27,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     message_text: ["message.text", "1:6"]
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-export/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-export/__snapshots__/html.expected/template.js
index d1b0c26751..a4d51377fc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-export/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-export/__snapshots__/html.expected/template.js
@@ -1,10 +1,9 @@
 export const v = 123;
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     value
   } = input;
   _$.write(`<div>${_$.escapeXML(value)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-flush-here/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-flush-here/__snapshots__/html.expected/template.js
index 31a9ef5687..4bce9df6be 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-flush-here/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-flush-here/__snapshots__/html.expected/template.js
@@ -1,7 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _ = _$.$global().__flush__ = _$.register(($global, html) => `BEFORE-${$global.runtimeId}-${html}-AFTER`, "__tests__/template.marko_0/_");
   _$.write("<h1>Hello World</h1>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/html.expected/template.js
index 0a670a951d..6350f10d90 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-fn-with-block/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<button>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/html.expected/template.js
index 045dccb3e6..cc1862b9df 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-handler-multi-ref-nested/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const a = [0];
   const b = 1;
@@ -13,5 +13,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     b: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/html.expected/template.js
index 3f8d8add2a..853f1b3291 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-handler-refless/__snapshots__/html.expected/template.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const data = 0;
   _$.write(`<button>${_$.escapeXML(data)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/tags/comments.js b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/tags/comments.js
index 0bb7baab14..71b6d3cf80 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/tags/comments.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/tags/comments.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+const _content = input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   _$.write("<ul>");
@@ -13,7 +13,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
       if (comment.comments) {
         const _scope2_id = _$.nextScopeId();
         const _childScope = _$.peekNextScope();
-        _renderer({
+        _content({
           comments: comment.comments,
           path: id
         });
@@ -50,5 +50,5 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/comments.marko", 0, {
     input_path: ["input.path"]
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/comments.marko", _renderer);
\ No newline at end of file
+};
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/comments.marko", _content);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/template.js
index ac95c0fa70..cd2a4e07ab 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/template.js
@@ -1,11 +1,10 @@
 import _comments from "./tags/comments.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _childScope = _$.peekNextScope();
   _comments(input);
   _$.writeScope(_scope0_id, {
     "#childScope/0": _$.writeExistingScope(_childScope)
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.hydrate.js b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.hydrate.js
index 67f4529463..42fd742d69 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.hydrate.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.hydrate.js
@@ -1,9 +1,2 @@
-// size: 130 (min) 120 (brotli)
-const _name$layout_content = _$.registerDynamicClosure(
-  "b1",
-  3,
-  (_scope, name) => _$.data(_scope[0], name),
-);
-_$.registerContent("b0", "<h1>Hello <!></h1>", "Db%", (_scope) => {
-  _name$layout_content._(_scope);
-});
+// size: 57 (min) 61 (brotli)
+_$.registerDynamicClosure("b1", 3, (_scope, name) => _$.data(_scope[0], name));
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.js
index cede0a53b5..4b2c682ce0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.js
@@ -6,7 +6,7 @@ const _name$layout_content = _$.registerDynamicClosure("__tests__/template.marko
 const _setup$layout_content = _scope => {
   _name$layout_content._(_scope);
 };
-const _layout_content = _$.registerContent("__tests__/template.marko_1_renderer", "<h1>Hello <!></h1>", /* next(1), over(1), replace */"Db%", _setup$layout_content);
+const _layout_content = /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", "<h1>Hello <!></h1>", /* next(1), over(1), replace */"Db%", _setup$layout_content);
 export const _name_ = /* @__PURE__ */_$.value("name", (_scope, name) => _name$layout_content(_scope));
 export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _name_(_scope, input.name));
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]));
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/tags/layout.js b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/tags/layout.js
index 426dc0def5..2911fee5c4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/tags/layout.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/tags/layout.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/layout.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     content
@@ -10,7 +10,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeTrailers("</body>");
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(content)
+    "#text/0(": _$.dynamicTagId(content)
   }, "__tests__/tags/layout.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/layout.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/template.js
index e8b583873d..2084399172 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/template.js
@@ -1,12 +1,12 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _layout from "./tags/layout.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     name
   } = input;
   _layout({
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       _$.write(`<h1>Hello <!>${_$.escapeXML(name)}${_$.markResumeNode(_scope1_id, "#text/0")}</h1>`);
       _$.writeEffect(_scope1_id, "__tests__/template.marko_1_name/subscriber");
@@ -14,12 +14,11 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
         _: _$.ensureScopeWithId(_scope0_id)
       }, "__tests__/template.marko", "2:2");
       _$.resumeClosestBranch(_scope1_id);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   });
   _$.writeScope(_scope0_id, {
     name
   }, "__tests__/template.marko", 0, {
     name: "1:10"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/resume.expected.md
index c0428039b2..f992f87058 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/resume.expected.md
@@ -13,7 +13,7 @@
     </h1>
     <!--M_]2 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={name:"World"},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b}),3,"__tests__/template.marko_1_name/subscriber",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={name:"World"},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b}),3,"__tests__/template.marko_1_name/subscriber",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/ssr.expected.md
index 6b354833f2..8d54dfb562 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <body><!--M_[3--><h1>Hello <!>World<!--M_*3 #text/0--></h1><!--M_]2 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:_.a={name:"World"},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b}),3,"__tests__/template.marko_1_name/subscriber",0];M._.w()</script></body>
+  <body><!--M_[3--><h1>Hello <!>World<!--M_*3 #text/0--></h1><!--M_]2 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:_.a={name:"World"},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b}),3,"__tests__/template.marko_1_name/subscriber",0];M._.w()</script></body>
 ```
 
 # Render End
@@ -17,7 +17,7 @@
     </h1>
     <!--M_]2 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={name:"World"},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b}),3,"__tests__/template.marko_1_name/subscriber",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={name:"World"},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b}),3,"__tests__/template.marko_1_name/subscriber",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-computed/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-computed/__snapshots__/html.expected/template.js
index 4793871d38..bf5992a2f0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-computed/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-member-expression-computed/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const items = ["a", "b", "c"];
   const index = 0;
@@ -13,5 +13,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     index: "2:5"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-merge-member-expression/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-merge-member-expression/__snapshots__/html.expected/template.js
index ed1bf8696c..73fa870c61 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-merge-member-expression/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-merge-member-expression/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const foo = {};
   const {
@@ -8,5 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.write(`<div${_$.classAttr((foo, foo.class))}></div>${_$.markResumeNode(_scope0_id, "#div/0")}<div${_$.classAttr((foo, foo.class))}></div>${_$.markResumeNode(_scope0_id, "#div/1")}<button>Click</button>${_$.markResumeNode(_scope0_id, "#button/2")}`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/tags/child.js
index 86e24fcb10..49f1d2ffa6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/tags/child.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     name
   } = input;
   _$.write(`<div>${_$.escapeXML(name)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/template.js
index 5338fdf0fa..665ac0ac8c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const items = [0, 1];
@@ -37,5 +37,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     items: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/tags/child.js
index 1d68c8f321..957a8d1c9c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     content,
@@ -13,10 +13,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     content,
     value,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(content)
+    "#text/0(": _$.dynamicTagId(content)
   }, "__tests__/tags/child.marko", 0, {
     content: "1:9",
     value: "1:18"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/template.js
index e14931589e..f756fbe02d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const y = 2;
@@ -8,12 +8,12 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   const _childScope2 = _$.peekNextScope();
   _child({
     value: x,
-    content: _$.register(/* @__PURE__ */_$.createRenderer(outer => {
+    content: _$.registerContent("__tests__/template.marko_1_renderer", outer => {
       const _scope1_id = _$.nextScopeId();
       const _childScope = _$.peekNextScope();
       _child({
         value: y,
-        content: _$.register(/* @__PURE__ */_$.createRenderer(inner => {
+        content: _$.registerContent("__tests__/template.marko_2_renderer", inner => {
           const _scope2_id = _$.nextScopeId();
           _$.write(`<div>${_$.escapeXML(outer)}${_$.markResumeNode(_scope2_id, "#text/0")}.<!>${_$.escapeXML(inner)}${_$.markResumeNode(_scope2_id, "#text/1")}</div>`);
           _$.writeEffect(_scope2_id, "__tests__/template.marko_2_outer/subscriber");
@@ -21,7 +21,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
             _: _$.ensureScopeWithId(_scope1_id)
           }, "__tests__/template.marko", "7:6");
           _$.resumeClosestBranch(_scope2_id);
-        }), "__tests__/template.marko_2_renderer", _scope1_id)
+        }, _scope1_id)
       });
       _$.writeEffect(_scope1_id, "__tests__/template.marko_1_y/subscriber");
       _$.writeScope(_scope1_id, {
@@ -32,7 +32,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
         outer: "6:8"
       });
       _$.resumeClosestBranch(_scope1_id);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    }, _scope0_id)
   });
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0_x");
   _$.writeScope(_scope0_id, {
@@ -44,5 +44,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     y: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/resume.expected.md
index d7acaeae4b..18803b4759 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/resume.expected.md
@@ -24,7 +24,7 @@
       <!--M_]2 #text/0-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={x:1,y:2,"#childScope/1":_.b={value:1,"#text/0!":_.c={outer:1,"#childScope/0":_.d={value:2,"#text/0!":_.e={}}}}},2:_.b,3:_.c,4:_.d,5:_.e},_.b.content=_.b["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d.content=_.d["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.c),_.e._=_.c,_.c._=_.a,_.f),5,"__tests__/template.marko_2_outer/subscriber",3,"__tests__/template.marko_1_y/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={x:1,y:2,"#childScope/1":_.b={value:1,"#text/0!":_.c={outer:1,"#childScope/0":_.d={value:2,"#text/0!":_.e={},"#text/0(":"__tests__/template.marko_2_renderer"}},"#text/0(":"__tests__/template.marko_1_renderer"}},2:_.b,3:_.c,4:_.d,5:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.d.content=_._["__tests__/template.marko_2_renderer"](_.c),_.e._=_.c,_.c._=_.a,_.f),5,"__tests__/template.marko_2_outer/subscriber",3,"__tests__/template.marko_1_y/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -60,7 +60,7 @@ container.querySelector("button").click();
       <!--M_]2 #text/0-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={x:1,y:2,"#childScope/1":_.b={value:1,"#text/0!":_.c={outer:1,"#childScope/0":_.d={value:2,"#text/0!":_.e={}}}}},2:_.b,3:_.c,4:_.d,5:_.e},_.b.content=_.b["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d.content=_.d["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.c),_.e._=_.c,_.c._=_.a,_.f),5,"__tests__/template.marko_2_outer/subscriber",3,"__tests__/template.marko_1_y/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={x:1,y:2,"#childScope/1":_.b={value:1,"#text/0!":_.c={outer:1,"#childScope/0":_.d={value:2,"#text/0!":_.e={},"#text/0(":"__tests__/template.marko_2_renderer"}},"#text/0(":"__tests__/template.marko_1_renderer"}},2:_.b,3:_.c,4:_.d,5:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.d.content=_._["__tests__/template.marko_2_renderer"](_.c),_.e._=_.c,_.c._=_.a,_.f),5,"__tests__/template.marko_2_outer/subscriber",3,"__tests__/template.marko_1_y/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -100,7 +100,7 @@ container.querySelector("button").click();
       <!--M_]2 #text/0-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={x:1,y:2,"#childScope/1":_.b={value:1,"#text/0!":_.c={outer:1,"#childScope/0":_.d={value:2,"#text/0!":_.e={}}}}},2:_.b,3:_.c,4:_.d,5:_.e},_.b.content=_.b["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d.content=_.d["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.c),_.e._=_.c,_.c._=_.a,_.f),5,"__tests__/template.marko_2_outer/subscriber",3,"__tests__/template.marko_1_y/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={x:1,y:2,"#childScope/1":_.b={value:1,"#text/0!":_.c={outer:1,"#childScope/0":_.d={value:2,"#text/0!":_.e={},"#text/0(":"__tests__/template.marko_2_renderer"}},"#text/0(":"__tests__/template.marko_1_renderer"}},2:_.b,3:_.c,4:_.d,5:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.d.content=_._["__tests__/template.marko_2_renderer"](_.c),_.e._=_.c,_.c._=_.a,_.f),5,"__tests__/template.marko_2_outer/subscriber",3,"__tests__/template.marko_1_y/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -140,7 +140,7 @@ container.querySelector("button").click();
       <!--M_]2 #text/0-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={x:1,y:2,"#childScope/1":_.b={value:1,"#text/0!":_.c={outer:1,"#childScope/0":_.d={value:2,"#text/0!":_.e={}}}}},2:_.b,3:_.c,4:_.d,5:_.e},_.b.content=_.b["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d.content=_.d["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.c),_.e._=_.c,_.c._=_.a,_.f),5,"__tests__/template.marko_2_outer/subscriber",3,"__tests__/template.marko_1_y/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={x:1,y:2,"#childScope/1":_.b={value:1,"#text/0!":_.c={outer:1,"#childScope/0":_.d={value:2,"#text/0!":_.e={},"#text/0(":"__tests__/template.marko_2_renderer"}},"#text/0(":"__tests__/template.marko_1_renderer"}},2:_.b,3:_.c,4:_.d,5:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.d.content=_._["__tests__/template.marko_2_renderer"](_.c),_.e._=_.c,_.c._=_.a,_.f),5,"__tests__/template.marko_2_outer/subscriber",3,"__tests__/template.marko_1_y/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/ssr.expected.md
index d6e36f2cff..c170f17e0a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Inc</button><!--M_*1 #button/0--><div><!--M_[3--><div><!--M_[5--><div>1<!--M_*5 #text/0-->.<!>2<!--M_*5 #text/1--></div><!--M_]4 #text/0--></div><!--M_]2 #text/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.f={1:_.a={x:1,y:2,"#childScope/1":_.b={value:1,"#text/0!":_.c={outer:1,"#childScope/0":_.d={value:2,"#text/0!":_.e={}}}}},2:_.b,3:_.c,4:_.d,5:_.e},_.b.content=_.b["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d.content=_.d["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.c),_.e._=_.c,_.c._=_.a,_.f),5,"__tests__/template.marko_2_outer/subscriber",3,"__tests__/template.marko_1_y/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()</script>
+  <button>Inc</button><!--M_*1 #button/0--><div><!--M_[3--><div><!--M_[5--><div>1<!--M_*5 #text/0-->.<!>2<!--M_*5 #text/1--></div><!--M_]4 #text/0--></div><!--M_]2 #text/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.f={1:_.a={x:1,y:2,"#childScope/1":_.b={value:1,"#text/0!":_.c={outer:1,"#childScope/0":_.d={value:2,"#text/0!":_.e={},"#text/0(":"__tests__/template.marko_2_renderer"}},"#text/0(":"__tests__/template.marko_1_renderer"}},2:_.b,3:_.c,4:_.d,5:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.d.content=_._["__tests__/template.marko_2_renderer"](_.c),_.e._=_.c,_.c._=_.a,_.f),5,"__tests__/template.marko_2_outer/subscriber",3,"__tests__/template.marko_1_y/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()</script>
 ```
 
 # Render End
@@ -29,7 +29,7 @@
       <!--M_]2 #text/0-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={x:1,y:2,"#childScope/1":_.b={value:1,"#text/0!":_.c={outer:1,"#childScope/0":_.d={value:2,"#text/0!":_.e={}}}}},2:_.b,3:_.c,4:_.d,5:_.e},_.b.content=_.b["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d.content=_.d["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.c),_.e._=_.c,_.c._=_.a,_.f),5,"__tests__/template.marko_2_outer/subscriber",3,"__tests__/template.marko_1_y/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={x:1,y:2,"#childScope/1":_.b={value:1,"#text/0!":_.c={outer:1,"#childScope/0":_.d={value:2,"#text/0!":_.e={},"#text/0(":"__tests__/template.marko_2_renderer"}},"#text/0(":"__tests__/template.marko_1_renderer"}},2:_.b,3:_.c,4:_.d,5:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.d.content=_._["__tests__/template.marko_2_renderer"](_.c),_.e._=_.c,_.c._=_.a,_.f),5,"__tests__/template.marko_2_outer/subscriber",3,"__tests__/template.marko_1_y/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.hydrate.js
index bb3e686604..bb26ae5924 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.hydrate.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.hydrate.js
@@ -1,4 +1,4 @@
-// size: 252 (min) 169 (brotli)
+// size: 181 (min) 139 (brotli)
 const _count$child_content_effect = _$.effect(
     "b1",
     (_scope, { _: { 1: count } }) =>
@@ -8,9 +8,6 @@ const _count$child_content_effect = _$.effect(
   ),
   _count$child_content = _$.registerDynamicClosure("b2", 1, (_scope, count) => {
     _$.data(_scope[1], count), _count$child_content_effect(_scope);
-  });
-_$.registerContent("b0", "<button> </button>", " D ", (_scope) => {
-  _count$child_content._(_scope);
-});
-const _count = _$.state(1, (_scope, count) => _count$child_content(_scope));
+  }),
+  _count = _$.state(1, (_scope, count) => _count$child_content(_scope));
 init();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.js
index fc6b8b4259..15adebb806 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.js
@@ -16,7 +16,7 @@ const _count$child_content = _$.registerDynamicClosure("__tests__/template.marko
 const _setup$child_content = _scope => {
   _count$child_content._(_scope);
 };
-const _child_content = _$.registerContent("__tests__/template.marko_1_renderer", "<button> </button>", /* get, next(1), get */" D ", _setup$child_content);
+const _child_content = /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", "<button> </button>", /* get, next(1), get */" D ", _setup$child_content);
 const _count = /* @__PURE__ */_$.state("count/1", (_scope, count) => _count$child_content(_scope));
 export function _setup_(_scope) {
   _child(_scope["#childScope/0"]);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/tags/child.js
index b326e14b78..eeef25eb26 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/tags/child.js
@@ -1,11 +1,10 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", input.content, {});
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(input.content)
+    "#text/0(": _$.dynamicTagId(input.content)
   }, "__tests__/tags/child.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/template.js
index 998c5036ea..9ebdc726ab 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/template.js
@@ -1,10 +1,10 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _child({
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       _$.write(`<button>${_$.escapeXML(count)}${_$.markResumeNode(_scope1_id, "#text/1")}</button>${_$.markResumeNode(_scope1_id, "#button/0")}`);
       _$.writeEffect(_scope1_id, "__tests__/template.marko_1_count/subscriber");
@@ -13,7 +13,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
         _: _$.ensureScopeWithId(_scope0_id)
       }, "__tests__/template.marko", "2:2");
       _$.resumeClosestBranch(_scope1_id);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   });
   _$.writeScope(_scope0_id, {
     count
@@ -21,5 +21,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/resume.expected.md
index 7511bb57b1..1939d9d0ce 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     <!--M_*3 #button/0-->
     <!--M_]2 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={count:0},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b}),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={count:0},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b}),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
@@ -39,7 +39,7 @@ container.querySelector("button").click();
     <!--M_*3 #button/0-->
     <!--M_]2 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={count:0},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b}),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={count:0},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b}),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
@@ -66,7 +66,7 @@ container.querySelector("button").click();
     <!--M_*3 #button/0-->
     <!--M_]2 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={count:0},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b}),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={count:0},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b}),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
@@ -93,7 +93,7 @@ container.querySelector("button").click();
     <!--M_*3 #button/0-->
     <!--M_]2 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={count:0},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b}),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={count:0},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b}),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/ssr.expected.md
index 0279af811d..5a636adc1b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[3--><button>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><!--M_]2 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:_.a={count:0},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b}),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()</script>
+  <!--M_[3--><button>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><!--M_]2 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:_.a={count:0},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b}),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()</script>
 ```
 
 # Render End
@@ -16,7 +16,7 @@
     <!--M_*3 #button/0-->
     <!--M_]2 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={count:0},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b}),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={count:0},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b}),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/tags/child.js
index b326e14b78..eeef25eb26 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/tags/child.js
@@ -1,11 +1,10 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", input.content, {});
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(input.content)
+    "#text/0(": _$.dynamicTagId(input.content)
   }, "__tests__/tags/child.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/template.js
index 3279652674..f2b44c75c7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/template.js
@@ -1,10 +1,10 @@
 import Child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   const _dynamicScope = _$.peekNextScope();
-  _$.dynamicTagInput(_scope0_id, "#text/0", false || Child, {}, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  _$.dynamicTagInput(_scope0_id, "#text/0", false || Child, {}, _$.registerContent("__tests__/template.marko_1_renderer", () => {
     const _scope1_id = _$.nextScopeId();
     _$.write(`<button>${_$.escapeXML(count)}${_$.markResumeNode(_scope1_id, "#text/1")}</button>${_$.markResumeNode(_scope1_id, "#button/0")}`);
     _$.writeEffect(_scope1_id, "__tests__/template.marko_1_count/subscriber");
@@ -13,14 +13,13 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
       _: _$.ensureScopeWithId(_scope0_id)
     }, "__tests__/template.marko", "4:4");
     _$.resumeClosestBranch(_scope1_id);
-  }), "__tests__/template.marko_1_renderer", _scope0_id));
+  }, _scope0_id));
   _$.writeScope(_scope0_id, {
     count,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(false || Child)
+    "#text/0(": _$.dynamicTagId(false || Child)
   }, "__tests__/template.marko", 0, {
     count: "3:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md
index a653590b70..c3aecd95e3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md
@@ -13,7 +13,7 @@
     <!--M_]2 #text/0-->
     <!--M_]1 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},2:_.c,3:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={},"#text/0(":"__tests__/template.marko_1_renderer"},"#text/0(":"__tests__/tags/child.marko"},2:_.c,3:_.b},_.b._=_.a,_.d),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
@@ -46,7 +46,7 @@ container.querySelector("button").click();
     <!--M_]2 #text/0-->
     <!--M_]1 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},2:_.c,3:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={},"#text/0(":"__tests__/template.marko_1_renderer"},"#text/0(":"__tests__/tags/child.marko"},2:_.c,3:_.b},_.b._=_.a,_.d),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
@@ -75,7 +75,7 @@ container.querySelector("button").click();
     <!--M_]2 #text/0-->
     <!--M_]1 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},2:_.c,3:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={},"#text/0(":"__tests__/template.marko_1_renderer"},"#text/0(":"__tests__/tags/child.marko"},2:_.c,3:_.b},_.b._=_.a,_.d),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
@@ -104,7 +104,7 @@ container.querySelector("button").click();
     <!--M_]2 #text/0-->
     <!--M_]1 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},2:_.c,3:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={},"#text/0(":"__tests__/template.marko_1_renderer"},"#text/0(":"__tests__/tags/child.marko"},2:_.c,3:_.b},_.b._=_.a,_.d),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md
index 4de49fb258..5ab26f2645 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[2--><!--M_[3--><button>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><!--M_]2 #text/0--><!--M_]1 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},2:_.c,3:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()</script>
+  <!--M_[2--><!--M_[3--><button>0<!--M_*3 #text/1--></button><!--M_*3 #button/0--><!--M_]2 #text/0--><!--M_]1 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={},"#text/0(":"__tests__/template.marko_1_renderer"},"#text/0(":"__tests__/tags/child.marko"},2:_.c,3:_.b},_.b._=_.a,_.d),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()</script>
 ```
 
 # Render End
@@ -18,7 +18,7 @@
     <!--M_]2 #text/0-->
     <!--M_]1 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},2:_.c,3:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={},"#text/0(":"__tests__/template.marko_1_renderer"},"#text/0(":"__tests__/tags/child.marko"},2:_.c,3:_.b},_.b._=_.a,_.d),3,"__tests__/template.marko_1_count/subscriber",3,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/html.expected/template.js
index 55a3b67334..7414e91138 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-for/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const selected = 0;
@@ -19,5 +19,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     "#text/0(": _scope1_.size ? _scope1_ : undefined
   }, "__tests__/template.marko", 0);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/html.expected/template.js
index 9dddd3da2c..36d5f87a99 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-if/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const clickCount = 0;
@@ -33,5 +33,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "2:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/html.expected/template.js
index b8198b9f9b..7b403acc60 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-push-pop-list/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const id = 0;
@@ -23,5 +23,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     items: "3:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/html.expected/template.js
index 7912d0bba1..072055474f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-shared-node-ref/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const open = true;
@@ -26,5 +26,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     list: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-static/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-static/__snapshots__/html.expected/template.js
index 2825e78984..312aabb11c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-static/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-static/__snapshots__/html.expected/template.js
@@ -1,7 +1,6 @@
 const x = 1;
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div><span>${_$.escapeXML(x)}</span></div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/html.expected/template.js
index d3b354c243..0d34abe2ad 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-toggle-show/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const show = true;
@@ -23,5 +23,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     show: "2:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/html.expected/template.js
index afebfc9255..451995bfdd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/basic-unused-ref/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const unused_1 = 123;
   const unused_2 = 456;
@@ -12,5 +12,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "4:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/html.expected/template.js
index a91d0ab8a6..d3b6c4d324 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/batched-updates-cleanup/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const show = true;
@@ -27,5 +27,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     message: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/batched-updates/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/batched-updates/__snapshots__/html.expected/template.js
index a6d7d0d0fb..9d98afd7c7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/batched-updates/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/batched-updates/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const a = 0;
   const b = 0;
@@ -13,5 +13,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     b: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/csr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/csr.expected.md
index 05d2ddb7d3..7312de5c9e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/csr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/csr.expected.md
@@ -22,9 +22,7 @@ container.querySelector("button").click();
 
 # Mutations
 ```
-INSERT button/#text
-REMOVE #text after button/#text
-UPDATE button/#text " " => "1"
+UPDATE button/#text "0" => "1"
 ```
 
 # Render
@@ -39,9 +37,7 @@ container.querySelector("button").click();
 
 # Mutations
 ```
-INSERT button/#text
-REMOVE #text after button/#text
-UPDATE button/#text " " => "2"
+UPDATE button/#text "1" => "2"
 ```
 
 # Render
@@ -56,7 +52,5 @@ container.querySelector("button").click();
 
 # Mutations
 ```
-INSERT button/#text
-REMOVE #text after button/#text
-UPDATE button/#text " " => "3"
+UPDATE button/#text "2" => "3"
 ```
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/tags/FancyButton.js b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/tags/FancyButton.js
index a3f1fb483b..e26c0f980e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/tags/FancyButton.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/tags/FancyButton.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/FancyButton.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     content,
@@ -13,9 +13,8 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     attrs,
     "#text/1!": _$.writeExistingScope(_dynamicScope),
-    "#text/1(": _$.normalizeDynamicRenderer(content)
+    "#text/1(": _$.dynamicTagId(content)
   }, "__tests__/tags/FancyButton.marko", 0, {
     attrs: "1:22"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/FancyButton.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/template.js
index 3a800ef7fa..54b9bfd59f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _FancyButton from "./tags/FancyButton.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   const _childScope = _$.peekNextScope();
@@ -8,7 +8,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     onClick: _$.register(function () {
       clickCount++;
     }, "__tests__/template.marko_0/onClick", _scope0_id),
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: _$.registerContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       _$.write(`${_$.escapeXML(clickCount)}${_$.markResumeNode(_scope1_id, "#text/0")}`);
       _$.writeEffect(_scope1_id, "__tests__/template.marko_1_clickCount/subscriber");
@@ -16,7 +16,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
         _: _$.ensureScopeWithId(_scope0_id)
       }, "__tests__/template.marko", "2:2");
       _$.resumeClosestBranch(_scope1_id);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    }, _scope0_id)
   });
   _$.writeScope(_scope0_id, {
     clickCount,
@@ -25,5 +25,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md
index ff7b79b159..d11ceb6e4a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     </button>
     <!--M_*2 #button/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={}}},2:_.e,3:_.d},_.b.click=_.c.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.d._=_.a,_.e["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.f),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/FancyButton.marko_0_attrs",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.e,3:_.d},_.b.click=_.c.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.d._=_.a,_.f),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/FancyButton.marko_0_attrs",0];M._.w()
     </script>
   </body>
 </html>
@@ -27,13 +27,14 @@ container.querySelector("button").click();
   <head />
   <body>
     <button>
+      <!--M_[3-->
       1
       <!--M_*3 #text/0-->
       <!--M_]2 #text/1-->
     </button>
     <!--M_*2 #button/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={}}},2:_.e,3:_.d},_.b.click=_.c.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.d._=_.a,_.e["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.f),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/FancyButton.marko_0_attrs",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.e,3:_.d},_.b.click=_.c.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.d._=_.a,_.f),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/FancyButton.marko_0_attrs",0];M._.w()
     </script>
   </body>
 </html>
@@ -41,10 +42,7 @@ container.querySelector("button").click();
 
 # Mutations
 ```
-INSERT html/body/button/#text
-REMOVE #comment after html/body/button/#text
-REMOVE #text after html/body/button/#text
-UPDATE html/body/button/#text " " => "1"
+UPDATE html/body/button/#text "0" => "1"
 ```
 
 # Render
@@ -56,13 +54,14 @@ container.querySelector("button").click();
   <head />
   <body>
     <button>
+      <!--M_[3-->
       2
       <!--M_*3 #text/0-->
       <!--M_]2 #text/1-->
     </button>
     <!--M_*2 #button/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={}}},2:_.e,3:_.d},_.b.click=_.c.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.d._=_.a,_.e["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.f),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/FancyButton.marko_0_attrs",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.e,3:_.d},_.b.click=_.c.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.d._=_.a,_.f),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/FancyButton.marko_0_attrs",0];M._.w()
     </script>
   </body>
 </html>
@@ -70,9 +69,7 @@ container.querySelector("button").click();
 
 # Mutations
 ```
-INSERT html/body/button/#text
-REMOVE #text after html/body/button/#text
-UPDATE html/body/button/#text " " => "2"
+UPDATE html/body/button/#text "1" => "2"
 ```
 
 # Render
@@ -84,13 +81,14 @@ container.querySelector("button").click();
   <head />
   <body>
     <button>
+      <!--M_[3-->
       3
       <!--M_*3 #text/0-->
       <!--M_]2 #text/1-->
     </button>
     <!--M_*2 #button/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={}}},2:_.e,3:_.d},_.b.click=_.c.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.d._=_.a,_.e["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.f),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/FancyButton.marko_0_attrs",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.e,3:_.d},_.b.click=_.c.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.d._=_.a,_.f),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/FancyButton.marko_0_attrs",0];M._.w()
     </script>
   </body>
 </html>
@@ -98,7 +96,5 @@ container.querySelector("button").click();
 
 # Mutations
 ```
-INSERT html/body/button/#text
-REMOVE #text after html/body/button/#text
-UPDATE html/body/button/#text " " => "3"
+UPDATE html/body/button/#text "2" => "3"
 ```
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md
index 81f75b1b08..68d9af6454 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button><!--M_[3-->0<!--M_*3 #text/0--><!--M_]2 #text/1--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.f={1:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={}}},2:_.e,3:_.d},_.b.click=_.c.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.d._=_.a,_.e["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.f),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/FancyButton.marko_0_attrs",0];M._.w()</script>
+  <button><!--M_[3-->0<!--M_*3 #text/0--><!--M_]2 #text/1--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.f={1:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.e,3:_.d},_.b.click=_.c.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.d._=_.a,_.f),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/FancyButton.marko_0_attrs",0];M._.w()</script>
 ```
 
 # Render End
@@ -16,7 +16,7 @@
     </button>
     <!--M_*2 #button/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={}}},2:_.e,3:_.d},_.b.click=_.c.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.d._=_.a,_.e["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.f),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/FancyButton.marko_0_attrs",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={clickCount:0,"#childScope/0":_.e={"#button/0~":_.b={},attrs:_.c={},"#text/1!":_.d={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.e,3:_.d},_.b.click=_.c.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.d._=_.a,_.f),3,"__tests__/template.marko_1_clickCount/subscriber",2,"__tests__/tags/FancyButton.marko_0_attrs",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/tags/child.js
index dba6e9e57a..f2aeb55459 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     name,
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     write: "1:15"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/template.js
index 5ab7f17dbd..39c7da3cae 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const items = [1, 2, 3];
@@ -31,5 +31,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     write: "5:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/tags/child.js
index 93e89197bc..4cea177352 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     name,
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     write: "1:15"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/template.js
index 7fb08d5b24..98ccd479bd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId3, _ifBranch3;
   const showOuter = true;
@@ -79,5 +79,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     write: "9:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/html.expected/template.js
index 45d217dab6..1ff26614b0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-same-scope/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const show = true;
@@ -26,5 +26,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     show: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/tags/child.js
index 0a167b5d02..98f2e3f616 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div>a</div><span>b</span><p>c</p>");
   _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_input");
@@ -9,5 +9,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     input: 0
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/template.js
index f14941ace0..84286102f2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const show = true;
@@ -30,5 +30,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     show: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/tags/child.js
index b34a458d58..e750f5211a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     name,
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     write: "1:15"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/template.js
index 4b031091b6..e07e78b28c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const items = [1, 2, 3];
@@ -54,5 +54,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     write: "5:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/tags/child.js
index b34a458d58..e750f5211a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     name,
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     write: "1:15"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/template.js
index 3d8d929116..d6a8fc152d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const items = [1, 2, 3];
@@ -31,5 +31,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     write: "5:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/tags/child.js
index 427f2b546f..a9f82297e4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     name,
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     write: "1:15"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/template.js
index 86f1955983..e3c027e172 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId3, _ifBranch3;
   const showOuter = true;
@@ -79,5 +79,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     write: "9:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/html.expected/template.js
index 135cbdb4d8..1a1bc9360b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-same-scope/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const show = true;
@@ -26,5 +26,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     show: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/tags/child.js
index b19a093ea2..2229ab056d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div>child</div>");
   _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_input");
@@ -9,5 +9,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     input: 0
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/template.js
index b3ef818146..118318aede 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const show = true;
@@ -30,5 +30,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     show: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/comments/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/comments/__snapshots__/html.expected/template.js
index a43dfc794c..e17bb42267 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/comments/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/comments/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div><!--abc--><!--[if lt IE 9]><script src=\"...\"></script><![endif]--></div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/tags/counter.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/tags/counter.js
index 4230e95a7a..7da04ac937 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/tags/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/tags/counter.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<button>${_$.escapeXML(input.format(count))}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -12,5 +12,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/template.js
index 8e79f0f4e4..7989f36fda 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/template.js
@@ -1,10 +1,9 @@
 import { formatNumber } from "./helpers";
 import _counter from "./tags/counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _counter({
     format: formatNumber
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/tags/display-intersection.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/tags/display-intersection.js
index 3afb5aeee3..6bb522bd40 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/tags/display-intersection.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/tags/display-intersection.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/display-intersection.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     value
@@ -14,5 +14,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     dummy: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/display-intersection.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/template.js
index dc660dd95c..c03265090c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _displayIntersection from "./tags/display-intersection.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   const _childScope = _$.peekNextScope();
@@ -16,5 +16,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/tags/counter.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/tags/counter.js
index 4230e95a7a..7da04ac937 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/tags/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/tags/counter.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<button>${_$.escapeXML(input.format(count))}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -12,5 +12,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/template.js
index b97c642ae1..cd2027096e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/template.js
@@ -7,7 +7,7 @@ function formatNumber2(n) {
 _$.register(formatNumber2, "__tests__/template.marko_0/formatNumber2");
 import _counter from "./tags/counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _counter({
     format: formatNumber
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _counter({
     format: formatNumber2
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/conditional-table-row/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/conditional-table-row/__snapshots__/html.expected/template.js
index 988020f344..31ebfe8c57 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/conditional-table-row/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/conditional-table-row/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const show = false;
@@ -23,5 +23,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     show: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/const-tag-destructure/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/const-tag-destructure/__snapshots__/html.expected/template.js
index 6a27dee58f..297194adf7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/const-tag-destructure/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/const-tag-destructure/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const z = {
     x: 1,
@@ -11,5 +11,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   } = z;
   _$.write(`<div>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>${_$.escapeXML(y)}${_$.markResumeNode(_scope0_id, "#text/1")}`);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/const-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/const-tag/__snapshots__/html.expected/template.js
index 1f7d42f1ec..ec57d489f7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/const-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/const-tag/__snapshots__/html.expected/template.js
@@ -1,8 +1,7 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const y = 1;
   _$.write(`<div>${_$.escapeXML(x)}</div>${_$.escapeXML(y)}`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/tags/checkbox.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/tags/checkbox.js
index baec0ea0b8..fafcdbe5ec 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/tags/checkbox.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/tags/checkbox.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/checkbox.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<input${_$.attrs({
     type: "checkbox",
@@ -11,5 +11,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/checkbox.marko", 0, {
     input: 0
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/checkbox.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/template.js
index 4c3551a128..35fae9e6e8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _checkbox from "./tags/checkbox.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const checked = false;
   const _childScope = _$.peekNextScope();
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     "#childScope/0": _$.writeExistingScope(_childScope)
   }, "__tests__/template.marko", 0);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/html.expected/template.js
index 251e05571e..d7df1d403d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-value/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const checkedValue = "a";
   const _checkedValueChange = _$.register(_new_checkedValue => {
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _checkedValueChange: 0
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/tags/checkbox.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/tags/checkbox.js
index baec0ea0b8..fafcdbe5ec 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/tags/checkbox.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/tags/checkbox.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/checkbox.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<input${_$.attrs({
     type: "checkbox",
@@ -11,5 +11,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/checkbox.marko", 0, {
     input: 0
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/checkbox.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/template.js
index 5e31a4c7ef..7129d92c22 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _checkbox from "./tags/checkbox.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const checkedValue = ["a", "b"];
   const _checkedValueChange = _$.register(_new_checkedValue => {
@@ -34,5 +34,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _checkedValueChange: 0
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/html.expected/template.js
index e98a8a9341..c28e216e99 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const checkedValue = ["a", "b"];
   const _checkedValueChange = _$.register(_new_checkedValue => {
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _checkedValueChange: 0
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/html.expected/template.js
index 5b5f70be4c..3c666c846a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const checked = false;
   _$.write(`<input${_$.controllable_input_checked(_scope0_id, "#input/0", checked, _$.register(_new_checked => {
@@ -12,5 +12,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     checked: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/html.expected/template.js
index e56ef37b45..31b495b3b8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-input-value/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const value = "hello";
   _$.write(`<input${_$.controllable_input_value(_scope0_id, "#input/0", value, _$.register(_new_value => {
@@ -12,5 +12,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     value: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/html.expected/template.js
index 6a72450a14..9a6ede0710 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-select-dynamic-spread/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const value = "b";
   const tag = "select";
@@ -9,7 +9,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     valueChange: _$.register(function (v) {
       value = v;
     }, "__tests__/template.marko_0/valueChange", _scope0_id)
-  }, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  }, _$.registerContent("__tests__/template.marko_1_renderer", () => {
     const _scope1_id = _$.nextScopeId();
     _$.write(`<option${_$.attrs({
       value: "a"
@@ -19,15 +19,14 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
       value: "c"
     }, "#option/2", _scope1_id, "option")}>C</option>${_$.markResumeNode(_scope1_id, "#option/2")}`);
     _$.writeEffect(_scope1_id, "__tests__/template.marko_1");
-  }), "__tests__/template.marko_1_renderer", _scope0_id));
+  }, _scope0_id));
   _$.write(`<span>${_$.escapeXML(value)}${_$.markResumeNode(_scope0_id, "#text/1")}</span>`);
   _$.writeScope(_scope0_id, {
     tag,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(tag ? "select" : {})
+    "#text/0(": _$.dynamicTagId(tag ? "select" : {})
   }, "__tests__/template.marko", 0, {
     tag: "2:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-select-mutated-option/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-select-mutated-option/__snapshots__/html.expected/template.js
index 34ef7980fc..13cbd4d45d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-select-mutated-option/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-select-mutated-option/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const options = [1, 2, 3];
@@ -29,5 +29,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     value: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-select/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-select/__snapshots__/html.expected/template.js
index 1aba64dc04..c6cde266ab 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-select/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-select/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const value = "b";
   _$.controllable_select_value(_scope0_id, "#select/0", value, _$.register(function (v) {
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     value: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/html.expected/template.js
index 6302e4727c..4cdf3c0eee 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-textarea-value/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const value = "hello";
   _$.write(`<textarea>${_$.controllable_textarea_value(_scope0_id, "#textarea/0", value, _$.register(_new_value => {
@@ -12,5 +12,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     value: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/html.expected/template.js
index 21549a6ebf..4a39388e78 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/counter-intersection/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const a = 0;
   const b = 0;
@@ -13,5 +13,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     b: "3:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/html.expected/template.js
index b46dc52560..d88d78eb7b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/create-and-clear-rows-loop-from/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   _$.write("<div>");
@@ -20,5 +20,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     input_to: ["input.to"],
     input_step: ["input.step"]
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/html.expected/template.js
index 99dd621967..744f15e342 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/create-and-clear-rows-loop-in/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const _scope2_ = new Map();
@@ -21,5 +21,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     "#text/0(": _scope1_.size ? _scope1_ : undefined,
     "#text/1(": _scope2_.size ? _scope2_ : undefined
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/dom.expected/template.hydrate.js b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/dom.expected/template.hydrate.js
index de9bad8382..681bfea04f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/dom.expected/template.hydrate.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/dom.expected/template.hydrate.js
@@ -1,4 +1,4 @@
-// size: 393 (min) 228 (brotli)
+// size: 328 (min) 189 (brotli)
 const _value = _$.state(3, (_scope, value) => _$.tagVarSignal(_scope, value));
 _$.register("a0", function (_scope) {
   return (_new_value) => {
@@ -15,11 +15,8 @@ const _count$myTag_content_effect = _$.effect(
   _count$myTag_content = _$.registerDynamicClosure("c2", 3, (_scope, count) => {
     _$.data(_scope[1], count), _count$myTag_content_effect(_scope);
   });
-_$.registerContent("c0", "<button> </button>", " D ", (_scope) => {
-  _count$myTag_content._(_scope);
-}),
-  _$.registerBoundSignal(
-    "c3",
-    _$.value(3, (_scope, count) => _count$myTag_content(_scope)),
-  ),
+_$.registerBoundSignal(
+  "c3",
+  _$.value(3, (_scope, count) => _count$myTag_content(_scope)),
+),
   init();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/dom.expected/template.js
index 414e31d9c3..52a456f1aa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/dom.expected/template.js
@@ -17,7 +17,7 @@ const _count$myTag_content = _$.registerDynamicClosure("__tests__/template.marko
 const _setup$myTag_content = _scope => {
   _count$myTag_content._(_scope);
 };
-const _myTag_content = _$.registerContent("__tests__/template.marko_1_renderer", "<button> </button>", /* get, next(1), get */" D ", _setup$myTag_content);
+const _myTag_content = /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", "<button> </button>", /* get, next(1), get */" D ", _setup$myTag_content);
 const _count = _$.registerBoundSignal("__tests__/template.marko_0_count/var", /* @__PURE__ */_$.value("count", (_scope, count) => _count$myTag_content(_scope)));
 export function _setup_(_scope) {
   _$.setTagVar(_scope, "#childScope/0", _count);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/html.expected/tags/my-let.js b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/html.expected/tags/my-let.js
index c3a569c581..950f8c7d27 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/html.expected/tags/my-let.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/html.expected/tags/my-let.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-let.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const value = input.value;
   const _return = value;
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/my-let.marko", 0);
   _$.resumeClosestBranch(_scope0_id);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-let.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/html.expected/tags/my-tag.js b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/html.expected/tags/my-tag.js
index c0660edcae..1e7d06acbe 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/html.expected/tags/my-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/html.expected/tags/my-tag.js
@@ -1,11 +1,10 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", input.content, {});
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(input.content)
+    "#text/0(": _$.dynamicTagId(input.content)
   }, "__tests__/tags/my-tag.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/html.expected/template.js
index 152cecbc26..db3f2c8d68 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/html.expected/template.js
@@ -1,7 +1,7 @@
 import _myLet from "./tags/my-let.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _myTag from "./tags/my-tag.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _childScope = _$.peekNextScope();
   const count = _myLet({
@@ -9,7 +9,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   });
   _$.setTagVar(_scope0_id, "#scopeOffset/1", _childScope, "__tests__/template.marko_0_count/var");
   _myTag({
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       _$.write(`<button>${_$.escapeXML(count)}${_$.markResumeNode(_scope1_id, "#text/1")}</button>${_$.markResumeNode(_scope1_id, "#button/0")}`);
       _$.writeEffect(_scope1_id, "__tests__/template.marko_1_count/subscriber");
@@ -18,7 +18,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
         _: _$.ensureScopeWithId(_scope0_id)
       }, "__tests__/template.marko", "2:1");
       _$.resumeClosestBranch(_scope1_id);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   });
   _$.writeScope(_scope0_id, {
     count,
@@ -26,5 +26,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/template.marko", 0, {
     count: "1:8"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/resume.expected.md
index c61d0b32c0..0e709a47c7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     <!--M_*5 #button/0-->
     <!--M_]4 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={}},2:_.a,4:{"#text/0!":_.c={_:_.b},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.b)},5:_.c},_.a["@"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.d),5,"__tests__/template.marko_1_count/subscriber",5,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={}},2:_.a,4:{"#text/0!":_.c={_:_.b},"#text/0(":"__tests__/template.marko_1_renderer"},5:_.c},_.a["@"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.d),5,"__tests__/template.marko_1_count/subscriber",5,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
@@ -39,7 +39,7 @@ container.querySelector("button").click();
     <!--M_*5 #button/0-->
     <!--M_]4 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={}},2:_.a,4:{"#text/0!":_.c={_:_.b},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.b)},5:_.c},_.a["@"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.d),5,"__tests__/template.marko_1_count/subscriber",5,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={}},2:_.a,4:{"#text/0!":_.c={_:_.b},"#text/0(":"__tests__/template.marko_1_renderer"},5:_.c},_.a["@"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.d),5,"__tests__/template.marko_1_count/subscriber",5,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
@@ -66,7 +66,7 @@ container.querySelector("button").click();
     <!--M_*5 #button/0-->
     <!--M_]4 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={}},2:_.a,4:{"#text/0!":_.c={_:_.b},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.b)},5:_.c},_.a["@"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.d),5,"__tests__/template.marko_1_count/subscriber",5,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={}},2:_.a,4:{"#text/0!":_.c={_:_.b},"#text/0(":"__tests__/template.marko_1_renderer"},5:_.c},_.a["@"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.d),5,"__tests__/template.marko_1_count/subscriber",5,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
@@ -93,7 +93,7 @@ container.querySelector("button").click();
     <!--M_*5 #button/0-->
     <!--M_]4 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={}},2:_.a,4:{"#text/0!":_.c={_:_.b},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.b)},5:_.c},_.a["@"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.d),5,"__tests__/template.marko_1_count/subscriber",5,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={}},2:_.a,4:{"#text/0!":_.c={_:_.b},"#text/0(":"__tests__/template.marko_1_renderer"},5:_.c},_.a["@"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.d),5,"__tests__/template.marko_1_count/subscriber",5,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/ssr.expected.md
index 4dc089ef44..0023110761 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cross-tag-closure/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[5--><button>0<!--M_*5 #text/1--></button><!--M_*5 #button/0--><!--M_]4 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={}},2:_.a,4:{"#text/0!":_.c={_:_.b},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.b)},5:_.c},_.a["@"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.d),5,"__tests__/template.marko_1_count/subscriber",5,"__tests__/template.marko_1_count",0];M._.w()</script>
+  <!--M_[5--><button>0<!--M_*5 #text/1--></button><!--M_*5 #button/0--><!--M_]4 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={}},2:_.a,4:{"#text/0!":_.c={_:_.b},"#text/0(":"__tests__/template.marko_1_renderer"},5:_.c},_.a["@"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.d),5,"__tests__/template.marko_1_count/subscriber",5,"__tests__/template.marko_1_count",0];M._.w()</script>
 ```
 
 # Render End
@@ -16,7 +16,7 @@
     <!--M_*5 #button/0-->
     <!--M_]4 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={}},2:_.a,4:{"#text/0!":_.c={_:_.b},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.b)},5:_.c},_.a["@"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.d),5,"__tests__/template.marko_1_count/subscriber",5,"__tests__/template.marko_1_count",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.b={"#scopeOffset/1":3,count:0,"#childScope/0":_.a={}},2:_.a,4:{"#text/0!":_.c={_:_.b},"#text/0(":"__tests__/template.marko_1_renderer"},5:_.c},_.a["@"]=_._["__tests__/tags/my-let.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.d),5,"__tests__/template.marko_1_count/subscriber",5,"__tests__/template.marko_1_count",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/html.expected/tags/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/html.expected/tags/custom-tag.js
index ea42c27369..113a110c48 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/html.expected/tags/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/html.expected/tags/custom-tag.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div></div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/html.expected/tags/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/html.expected/tags/custom-tag.js
index ea42c27369..113a110c48 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/html.expected/tags/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/html.expected/tags/custom-tag.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div></div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/hello/index.js
index 0ce7db78de..bf18cad45e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/hello/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/hello/index.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("Hello");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/message.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/message.js
index 77a5af6c71..3c6b35d94b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/message.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/message.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/message.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("Frank");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/message.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/template.js
index d332935e74..3664288b3a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("Hello Frank");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/tags/child.js
index 3359e70e6f..4b27185acd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/tags/child.js
@@ -1,7 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const value = input.value;
   _$.write(`<!>${_$.escapeXML(value)}${_$.markResumeNode(_scope0_id, "#text/0")} `);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/template.js
index 2e8fe67117..ba594a30ca 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = "y";
   _child({
@@ -14,5 +14,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     "#childScope/1": _$.writeExistingScope(_childScope)
   }, "__tests__/template.marko", 0);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/tags/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/tags/custom-tag.js
index b2bd37ce8f..0ebb221113 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/tags/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/tags/custom-tag.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const y = 10;
@@ -12,12 +12,11 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     x,
     y,
     "#text/3!": _$.writeExistingScope(_dynamicScope),
-    "#text/3(": _$.normalizeDynamicRenderer(input.content)
+    "#text/3(": _$.dynamicTagId(input.content)
   }, "__tests__/tags/custom-tag.marko", 0, {
     input_content: ["input.content"],
     x: "1:6",
     y: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/template.js
index 5870756481..b5c84dabb0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/template.js
@@ -1,12 +1,11 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _customTag from "./tags/custom-tag.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _customTag({
-    content: _$.register(/* @__PURE__ */_$.createRenderer((count, count2) => {
+    content: _$.registerContent("__tests__/template.marko_1_renderer", (count, count2) => {
       const _scope1_id = _$.nextScopeId();
       _$.write(`<div>Counts: <!>${_$.escapeXML(count)}${_$.markResumeNode(_scope1_id, "#text/0")},<!>${_$.escapeXML(count2)}${_$.markResumeNode(_scope1_id, "#text/1")}</div>`);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    }, _scope0_id)
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/resume.expected.md
index 2e0fc587a4..bb11cea8dd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/resume.expected.md
@@ -27,7 +27,7 @@
     </div>
     <!--M_]2 #text/3-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,y:10,"#text/3!":_.c={},"#text/3(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x_y",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,y:10,"#text/3!":_.b={},"#text/3(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x_y",0];M._.w()
     </script>
   </body>
 </html>
@@ -66,7 +66,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]2 #text/3-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,y:10,"#text/3!":_.c={},"#text/3(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x_y",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,y:10,"#text/3!":_.b={},"#text/3(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x_y",0];M._.w()
     </script>
   </body>
 </html>
@@ -112,7 +112,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]2 #text/3-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,y:10,"#text/3!":_.c={},"#text/3(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x_y",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,y:10,"#text/3!":_.b={},"#text/3(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x_y",0];M._.w()
     </script>
   </body>
 </html>
@@ -158,7 +158,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]2 #text/3-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,y:10,"#text/3!":_.c={},"#text/3(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x_y",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,y:10,"#text/3!":_.b={},"#text/3(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x_y",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
index 4f93f99fa0..95dfbe39ca 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=inc>1<!--M_*2 #text/1-->,<!>10<!--M_*2 #text/2--></button><!--M_*2 #button/0--><!--M_[3--><div>Counts: <!>1<!--M_*3 #text/0-->,<!>10<!--M_*3 #text/1--></div><!--M_]2 #text/3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,y:10,"#text/3!":_.c={},"#text/3(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x_y",0];M._.w()</script>
+  <button class=inc>1<!--M_*2 #text/1-->,<!>10<!--M_*2 #text/2--></button><!--M_*2 #button/0--><!--M_[3--><div>Counts: <!>1<!--M_*3 #text/0-->,<!>10<!--M_*3 #text/1--></div><!--M_]2 #text/3--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,y:10,"#text/3!":_.b={},"#text/3(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x_y",0];M._.w()</script>
 ```
 
 # Render End
@@ -32,7 +32,7 @@
     </div>
     <!--M_]2 #text/3-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,y:10,"#text/3!":_.c={},"#text/3(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x_y",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,y:10,"#text/3!":_.b={},"#text/3(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x_y",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/tags/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/tags/custom-tag.js
index 82d54d524a..a1cd89fd1c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/tags/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/tags/custom-tag.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   _$.write(`<button class=inc>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -14,12 +14,11 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     input_name: input.name,
     x,
     "#text/2!": _$.writeExistingScope(_dynamicScope),
-    "#text/2(": _$.normalizeDynamicRenderer(input.content)
+    "#text/2(": _$.dynamicTagId(input.content)
   }, "__tests__/tags/custom-tag.marko", 0, {
     input_content: ["input.content"],
     input_name: ["input.name"],
     x: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/template.js
index 088dba6256..071ee8e4f2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/template.js
@@ -1,16 +1,15 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _customTag from "./tags/custom-tag.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _customTag({
     name: "hello",
-    content: _$.register(/* @__PURE__ */_$.createRenderer(({
+    content: _$.registerContent("__tests__/template.marko_1_renderer", ({
       count,
       name
     }) => {
       const _scope1_id = _$.nextScopeId();
       _$.write(`<div>Count (<!>${_$.escapeXML(name)}${_$.markResumeNode(_scope1_id, "#text/0")}): <!>${_$.escapeXML(count)}${_$.markResumeNode(_scope1_id, "#text/1")}</div>`);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    }, _scope0_id)
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/resume.expected.md
index d666475f50..7634995874 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/resume.expected.md
@@ -23,7 +23,7 @@
     </div>
     <!--M_]2 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),input_name:"hello",x:1,"#text/2!":_.c={},"#text/2(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),input_name:"hello",x:1,"#text/2!":_.b={},"#text/2(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -58,7 +58,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]2 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),input_name:"hello",x:1,"#text/2!":_.c={},"#text/2(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),input_name:"hello",x:1,"#text/2!":_.b={},"#text/2(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -98,7 +98,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]2 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),input_name:"hello",x:1,"#text/2!":_.c={},"#text/2(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),input_name:"hello",x:1,"#text/2!":_.b={},"#text/2(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -138,7 +138,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]2 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),input_name:"hello",x:1,"#text/2!":_.c={},"#text/2(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),input_name:"hello",x:1,"#text/2!":_.b={},"#text/2(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md
index befa6000ff..0c29660fb6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_[3--><div>Count (<!>hello<!--M_*3 #text/0-->): <!>1<!--M_*3 #text/1--></div><!--M_]2 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),input_name:"hello",x:1,"#text/2!":_.c={},"#text/2(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()</script>
+  <button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_[3--><div>Count (<!>hello<!--M_*3 #text/0-->): <!>1<!--M_*3 #text/1--></div><!--M_]2 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),input_name:"hello",x:1,"#text/2!":_.b={},"#text/2(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()</script>
 ```
 
 # Render End
@@ -28,7 +28,7 @@
     </div>
     <!--M_]2 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),input_name:"hello",x:1,"#text/2!":_.c={},"#text/2(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),input_name:"hello",x:1,"#text/2!":_.b={},"#text/2(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/tags/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/tags/custom-tag.js
index 1ff86dc0ef..931a37bf99 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/tags/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/tags/custom-tag.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   _$.write(`<button class=inc>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -10,11 +10,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     input_content: input.content,
     x,
     "#text/2!": _$.writeExistingScope(_dynamicScope),
-    "#text/2(": _$.normalizeDynamicRenderer(input.content)
+    "#text/2(": _$.dynamicTagId(input.content)
   }, "__tests__/tags/custom-tag.marko", 0, {
     input_content: ["input.content"],
     x: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/template.js
index bad115e5ff..090cfd372c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/template.js
@@ -1,12 +1,11 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _customTag from "./tags/custom-tag.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _customTag({
-    content: _$.register(/* @__PURE__ */_$.createRenderer(count => {
+    content: _$.registerContent("__tests__/template.marko_1_renderer", count => {
       const _scope1_id = _$.nextScopeId();
       _$.write(`<div>Count: <!>${_$.escapeXML(count)}${_$.markResumeNode(_scope1_id, "#text/0")}</div>`);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    }, _scope0_id)
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/resume.expected.md
index 0883a005f7..15f2ea5129 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/resume.expected.md
@@ -19,7 +19,7 @@
     </div>
     <!--M_]2 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,"#text/2!":_.c={},"#text/2(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,"#text/2!":_.b={},"#text/2(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -50,7 +50,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]2 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,"#text/2!":_.c={},"#text/2(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,"#text/2!":_.b={},"#text/2(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -86,7 +86,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]2 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,"#text/2!":_.c={},"#text/2(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,"#text/2!":_.b={},"#text/2(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -122,7 +122,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]2 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,"#text/2!":_.c={},"#text/2(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,"#text/2!":_.b={},"#text/2(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md
index 36a4afd11b..39c15f3da8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_[3--><div>Count: <!>1<!--M_*3 #text/0--></div><!--M_]2 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,"#text/2!":_.c={},"#text/2(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()</script>
+  <button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_[3--><div>Count: <!>1<!--M_*3 #text/0--></div><!--M_]2 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,"#text/2!":_.b={},"#text/2(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()</script>
 ```
 
 # Render End
@@ -24,7 +24,7 @@
     </div>
     <!--M_]2 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={2:{input_content:_.b=_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,"#text/2!":_.c={},"#text/2(":_.b},3:_.c}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{input_content:_._["__tests__/template.marko_1_renderer"](_.a={}),x:1,"#text/2!":_.b={},"#text/2(":"__tests__/template.marko_1_renderer"},3:_.b}),2,"__tests__/tags/custom-tag.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.hydrate.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.hydrate.js
index 81d94fbeda..3eb9cd79d3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.hydrate.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.hydrate.js
@@ -1,2 +1 @@
-// size: 51 (min) 52 (brotli)
-_$.registerContent("b0", "This is the body content");
+// size: 0
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.js
index ac25a51a48..feea5bc20c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.js
@@ -2,7 +2,7 @@ export const _template_ = `${_child_template}<!>`;
 export const _walks_ = /* beginChild, _child_walks, endChild */`/${_child_walks}&D`;
 import { _setup_ as _child, _content_ as _child_input_content, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child/index.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _child_content = _$.registerContent("__tests__/template.marko_1_renderer", "This is the body content");
+const _child_content = /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", "This is the body content");
 export function _setup_(_scope) {
   _child(_scope["#childScope/0"]);
   _child_input_content(_scope["#childScope/0"], _child_content(_scope));
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/tags/child/index.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/tags/child/index.js
index b99e78b34f..844f37929a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/tags/child/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/tags/child/index.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child/index.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     name,
@@ -10,7 +10,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.dynamicTagInput(_scope0_id, "#text/1", content, {});
   _$.writeScope(_scope0_id, {
     "#text/1!": _$.writeExistingScope(_dynamicScope),
-    "#text/1(": _$.normalizeDynamicRenderer(content)
+    "#text/1(": _$.dynamicTagId(content)
   }, "__tests__/tags/child/index.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child/index.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/template.js
index 1998c9d1d2..f9da2189d3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/template.js
@@ -1,13 +1,12 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child/index.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _child({
     name: "World",
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       _$.write("This is the body content");
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/resume.expected.md
index bef49806ad..a7f541de76 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/resume.expected.md
@@ -10,7 +10,7 @@
     This is the body content
     <!--M_]2 #text/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{"#text/1!":_.b={},"#text/1(":_._["__tests__/template.marko_1_renderer"](_.a={})},3:_.b}),0]
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={2:{"#text/1!":_.a={},"#text/1(":"__tests__/template.marko_1_renderer"},3:_.a}),0]
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/ssr.expected.md
index b9e1cf1609..cd35fbb186 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!>World<!--M_*2 #text/0--><!--M_[3-->This is the body content<!--M_]2 #text/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={2:{"#text/1!":_.b={},"#text/1(":_._["__tests__/template.marko_1_renderer"](_.a={})},3:_.b}),0]</script>
+  <!>World<!--M_*2 #text/0--><!--M_[3-->This is the body content<!--M_]2 #text/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={2:{"#text/1!":_.a={},"#text/1(":"__tests__/template.marko_1_renderer"},3:_.a}),0]</script>
 ```
 
 # Render End
@@ -15,7 +15,7 @@
     This is the body content
     <!--M_]2 #text/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={2:{"#text/1!":_.b={},"#text/1(":_._["__tests__/template.marko_1_renderer"](_.a={})},3:_.b}),0]
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={2:{"#text/1!":_.a={},"#text/1(":"__tests__/template.marko_1_renderer"},3:_.a}),0]
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-separate-assets/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-separate-assets/__snapshots__/html.expected/template.js
index ed9b2f9a93..f87a91f7d6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-separate-assets/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-separate-assets/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div></div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/html.expected/hello.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/html.expected/hello.js
index 2071933557..48e8e8b57b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/html.expected/hello.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/html.expected/hello.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/hello.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`Hello <!>${_$.escapeXML(input.name)}${_$.markResumeNode(_scope0_id, "#text/0")}!`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/hello.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/html.expected/template.js
index ed549be364..ef9c11d6cf 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-template/__snapshots__/html.expected/template.js
@@ -1,9 +1,8 @@
 import _hello from "./hello.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _hello({
     name: "Frank"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/tags/counter.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/tags/counter.js
index 38bef0a81f..6d30ea03f4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/tags/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/tags/counter.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   _$.write(`<button class=inc-child>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   });
   _$.resumeClosestBranch(_scope0_id);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/template.js
index e3254942e0..7a6f626474 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _counter from "./tags/counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _childScope = _$.peekNextScope();
   const count = _counter({});
@@ -14,5 +14,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/template.marko", 0, {
     count: "1:10"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/tags/child.js
index da1a231c0a..a69e5cfefa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/tags/child.js
@@ -1,10 +1,9 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   _$.write("<span>child</span>");
   const _return = x + 3;
   _$.resumeClosestBranch(_scope0_id);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/template.js
index 5d43e501f0..9cf10b5f1c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _childScope = _$.peekNextScope();
   const data = _child({});
@@ -9,5 +9,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     "#childScope/0": _$.writeExistingScope(_childScope)
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/html.expected/tags/child.js
index 4cc2c6c3a2..cda5c5a07d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 0;
   _$.write(`<button class=inc>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -14,5 +14,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   });
   _$.resumeClosestBranch(_scope0_id);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/html.expected/template.js
index abd0a735b1..8991ccc5e5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-intersection/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const name = "Marko";
   const _childScope = _$.peekNextScope();
@@ -19,5 +19,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     data: "2:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/tags/child.js
index 4d9efea133..2ac0b16ac8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const y = 2;
@@ -14,5 +14,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   });
   _$.resumeClosestBranch(_scope0_id);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/template.js
index 5d43e501f0..9cf10b5f1c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _childScope = _$.peekNextScope();
   const data = _child({});
@@ -9,5 +9,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     "#childScope/0": _$.writeExistingScope(_childScope)
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/tags/child.js
index 7fb0f792f9..eb69dedda7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   _$.write(`<button class=inc>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -12,5 +12,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   });
   _$.resumeClosestBranch(_scope0_id);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/template.js
index 5d43e501f0..9cf10b5f1c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _childScope = _$.peekNextScope();
   const data = _child({});
@@ -9,5 +9,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     "#childScope/0": _$.writeExistingScope(_childScope)
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/debug-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/debug-tag/__snapshots__/html.expected/template.js
index a043c0e5bc..4854f97397 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/debug-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/debug-tag/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   debugger;
   const x = 0;
@@ -7,5 +7,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   const y = 0;
   debugger;
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/csr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/csr.expected.md
index cbf3b9a8c4..9e4f8df66f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/csr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/csr.expected.md
@@ -35,8 +35,6 @@ container.querySelector("button").click();
 # Mutations
 ```
 UPDATE div[class] null => "selected"
-INSERT div/span
-REMOVE span after div/span
 ```
 
 # Render
@@ -57,8 +55,6 @@ container.querySelector("button").click();
 # Mutations
 ```
 UPDATE div[class] "selected" => null
-INSERT div/span
-REMOVE span after div/span
 ```
 
 # Render
@@ -81,6 +77,4 @@ container.querySelector("button").click();
 # Mutations
 ```
 UPDATE div[class] null => "selected"
-INSERT div/span
-REMOVE span after div/span
 ```
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.hydrate.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.hydrate.js
index fd18ce8dec..9d57a989cb 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.hydrate.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.hydrate.js
@@ -1,4 +1,4 @@
-// size: 381 (min) 207 (brotli)
+// size: 379 (min) 210 (brotli)
 const _dynamicTag = _$.dynamicTag(1),
   _input_thing_content_ = _$.value(6, (_scope, input_thing_content) =>
     _dynamicTag(_scope, input_thing_content),
@@ -10,7 +10,7 @@ const _dynamicTag = _$.dynamicTag(1),
     _input_thing_selected_(_scope, input_thing?.selected),
       _input_thing_content_(_scope, input_thing?.content);
   }),
-  _define_content = _$.registerContent("b0", "<span>The thing</span>"),
+  _define_content = _$.createContent("b0", "<span>The thing</span>"),
   _myThing = _$.value(3, (_scope, myThing) =>
     _input_thing_(_scope[0], myThing),
   ),
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.js
index 0a9bede788..b8290f5b83 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.js
@@ -2,7 +2,7 @@ export const _template_ = `${_child_template}<button>Toggle</button>`;
 export const _walks_ = /* beginChild, _child_walks, endChild, get, over(1) */`/${_child_walks}& b`;
 import { _setup_ as _child, _input_thing_ as _child_input_thing, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _define_content = _$.registerContent("__tests__/template.marko_1_renderer", "<span>The thing</span>");
+const _define_content = /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", "<span>The thing</span>");
 const _myThing = /* @__PURE__ */_$.value("myThing", (_scope, myThing) => _child_input_thing(_scope["#childScope/0"], myThing));
 const _selected_effect = _$.effect("__tests__/template.marko_0_selected", (_scope, {
   selected
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/tags/child.js
index cb8b4a91d9..ccd2ddf4b7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div${_$.classAttr({
     "selected": input.thing.selected
@@ -9,7 +9,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.write(`</div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
   _$.writeScope(_scope0_id, {
     "#text/1!": _$.writeExistingScope(_dynamicScope),
-    "#text/1(": _$.normalizeDynamicRenderer(input.thing.content)
+    "#text/1(": _$.dynamicTagId(input.thing.content)
   }, "__tests__/tags/child.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/template.js
index b0879097cb..3d515fba61 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/template.js
@@ -1,14 +1,14 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const selected = false;
   const myThing = {
     selected: selected,
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       _$.write("<span>The thing</span>");
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   };
   const _childScope = _$.peekNextScope();
   _child({
@@ -23,5 +23,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     selected: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/resume.expected.md
index 7532078925..958dfcb5d7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/resume.expected.md
@@ -16,7 +16,7 @@
     </button>
     <!--M_*1 #button/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={selected:!1,"#childScope/0":_.b={"#text/1!":_.c={}}},2:_.b,3:_.c},_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_selected",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:{selected:!1,"#childScope/0":_.a={"#text/1!":_.b={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.a,3:_.b}),1,"__tests__/template.marko_0_selected",0];M._.w()
     </script>
   </body>
 </html>
@@ -34,6 +34,7 @@ container.querySelector("button").click();
     <div
       class="selected"
     >
+      <!--M_[3-->
       <span>
         The thing
       </span>
@@ -45,7 +46,7 @@ container.querySelector("button").click();
     </button>
     <!--M_*1 #button/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={selected:!1,"#childScope/0":_.b={"#text/1!":_.c={}}},2:_.b,3:_.c},_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_selected",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:{selected:!1,"#childScope/0":_.a={"#text/1!":_.b={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.a,3:_.b}),1,"__tests__/template.marko_0_selected",0];M._.w()
     </script>
   </body>
 </html>
@@ -54,9 +55,6 @@ container.querySelector("button").click();
 # Mutations
 ```
 UPDATE html/body/div[class] null => "selected"
-INSERT html/body/div/span
-REMOVE #comment after html/body/div/span
-REMOVE span after html/body/div/span
 ```
 
 # Render
@@ -68,6 +66,7 @@ container.querySelector("button").click();
   <head />
   <body>
     <div>
+      <!--M_[3-->
       <span>
         The thing
       </span>
@@ -79,7 +78,7 @@ container.querySelector("button").click();
     </button>
     <!--M_*1 #button/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={selected:!1,"#childScope/0":_.b={"#text/1!":_.c={}}},2:_.b,3:_.c},_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_selected",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:{selected:!1,"#childScope/0":_.a={"#text/1!":_.b={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.a,3:_.b}),1,"__tests__/template.marko_0_selected",0];M._.w()
     </script>
   </body>
 </html>
@@ -88,8 +87,6 @@ container.querySelector("button").click();
 # Mutations
 ```
 UPDATE html/body/div[class] "selected" => null
-INSERT html/body/div/span
-REMOVE span after html/body/div/span
 ```
 
 # Render
@@ -103,6 +100,7 @@ container.querySelector("button").click();
     <div
       class="selected"
     >
+      <!--M_[3-->
       <span>
         The thing
       </span>
@@ -114,7 +112,7 @@ container.querySelector("button").click();
     </button>
     <!--M_*1 #button/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={selected:!1,"#childScope/0":_.b={"#text/1!":_.c={}}},2:_.b,3:_.c},_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_selected",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:{selected:!1,"#childScope/0":_.a={"#text/1!":_.b={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.a,3:_.b}),1,"__tests__/template.marko_0_selected",0];M._.w()
     </script>
   </body>
 </html>
@@ -123,6 +121,4 @@ container.querySelector("button").click();
 # Mutations
 ```
 UPDATE html/body/div[class] null => "selected"
-INSERT html/body/div/span
-REMOVE span after html/body/div/span
 ```
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/ssr.expected.md
index 20bc00fece..0854928f1b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <div><!--M_[3--><span>The thing</span><!--M_]2 #text/1--></div><!--M_*2 #div/0--><button>Toggle</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={selected:!1,"#childScope/0":_.b={"#text/1!":_.c={}}},2:_.b,3:_.c},_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_selected",0];M._.w()</script>
+  <div><!--M_[3--><span>The thing</span><!--M_]2 #text/1--></div><!--M_*2 #div/0--><button>Toggle</button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:{selected:!1,"#childScope/0":_.a={"#text/1!":_.b={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.a,3:_.b}),1,"__tests__/template.marko_0_selected",0];M._.w()</script>
 ```
 
 # Render End
@@ -21,7 +21,7 @@
     </button>
     <!--M_*1 #button/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={selected:!1,"#childScope/0":_.b={"#text/1!":_.c={}}},2:_.b,3:_.c},_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_selected",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:{selected:!1,"#childScope/0":_.a={"#text/1!":_.b={},"#text/1(":"__tests__/template.marko_1_renderer"}},2:_.a,3:_.b}),1,"__tests__/template.marko_0_selected",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/html.expected/template.js
index 741bc2b18e..fc7fcb4495 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-object/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const myObj = {
@@ -14,5 +14,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     x: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/html.expected/template.js
index b7f6f259a0..27a9d97fab 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/html.expected/template.js
@@ -1,12 +1,12 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const MyTag = {
-    content: _$.register(/* @__PURE__ */_$.createRenderer((a, b, c) => {
+    content: _$.registerContent("__tests__/template.marko_1_renderer", (a, b, c) => {
       const _scope1_id = _$.nextScopeId();
       _$.write(`<div>${_$.escapeXML(a)}${_$.markResumeNode(_scope1_id, "#text/0")}|<!>${_$.escapeXML(b)}${_$.markResumeNode(_scope1_id, "#text/1")}|<!>${_$.escapeXML(c)}${_$.markResumeNode(_scope1_id, "#text/2")}</div>`);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    }, _scope0_id)
   };
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagArgs(_scope0_id, "#text/0", MyTag, [1, "Hello", x]);
@@ -16,11 +16,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     x,
     MyTag,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(MyTag)
+    "#text/0(": _$.dynamicTagId(MyTag)
   }, "__tests__/template.marko", 0, {
     x: "1:6",
     MyTag: "2:9"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/ssr.expected.md
index 7bb1744575..4ddc809aaa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-args/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[2--><div>1<!--M_*2 #text/0-->|<!>Hello<!--M_*2 #text/1-->|<!>1<!--M_*2 #text/2--></div><!--M_]1 #text/0--><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={x:1,MyTag:_.b={},"#text/0!":_.c={}},2:_.c},_.b.content=_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_x",0];M._.w()</script>
+  <!--M_[2--><div>1<!--M_*2 #text/0-->|<!>Hello<!--M_*2 #text/1-->|<!>1<!--M_*2 #text/2--></div><!--M_]1 #text/0--><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={x:1,MyTag:_.b={},"#text/0!":_.c={},"#text/0(":"__tests__/template.marko_1_renderer"},2:_.c},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_x",0];M._.w()</script>
 ```
 
 # Render End
@@ -28,7 +28,7 @@
     </button>
     <!--M_*1 #button/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={x:1,MyTag:_.b={},"#text/0!":_.c={}},2:_.c},_.b.content=_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={x:1,MyTag:_.b={},"#text/0!":_.c={},"#text/0(":"__tests__/template.marko_1_renderer"},2:_.c},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/html.expected/template.js
index 60b6187e83..abc79034de 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/html.expected/template.js
@@ -1,14 +1,14 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const MyTag = {
-    content: _$.register(/* @__PURE__ */_$.createRenderer(({
+    content: _$.registerContent("__tests__/template.marko_1_renderer", ({
       number
     }) => {
       const _scope1_id = _$.nextScopeId();
       _$.write(`<div>${_$.escapeXML(number)}${_$.markResumeNode(_scope1_id, "#text/0")}</div>`);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    }, _scope0_id)
   };
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", MyTag, {
@@ -20,11 +20,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     x,
     MyTag,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(MyTag)
+    "#text/0(": _$.dynamicTagId(MyTag)
   }, "__tests__/template.marko", 0, {
     x: "1:6",
     MyTag: "2:9"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/ssr.expected.md
index d162fa58be..d668063eb3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-attr-signal/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[2--><div>1<!--M_*2 #text/0--></div><!--M_]1 #text/0--><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={x:1,MyTag:_.b={},"#text/0!":_.c={}},2:_.c},_.b.content=_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_x",0];M._.w()</script>
+  <!--M_[2--><div>1<!--M_*2 #text/0--></div><!--M_]1 #text/0--><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={x:1,MyTag:_.b={},"#text/0!":_.c={},"#text/0(":"__tests__/template.marko_1_renderer"},2:_.c},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_x",0];M._.w()</script>
 ```
 
 # Render End
@@ -20,7 +20,7 @@
     </button>
     <!--M_*1 #button/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={x:1,MyTag:_.b={},"#text/0!":_.c={}},2:_.c},_.b.content=_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={x:1,MyTag:_.b={},"#text/0!":_.c={},"#text/0(":"__tests__/template.marko_1_renderer"},2:_.c},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.d),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/dom.expected/template.js
index a1d606ee0f..91f8d32c66 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/dom.expected/template.js
@@ -5,7 +5,7 @@ const _x$define_content = _$.registerDynamicClosure("__tests__/template.marko_1_
 const _setup$define_content = _scope => {
   _x$define_content._(_scope);
 };
-const _define_content = _$.registerContent("__tests__/template.marko_1_renderer", "<div> </div>", /* next(1), get */"D ", _setup$define_content);
+const _define_content = /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", "<div> </div>", /* next(1), get */"D ", _setup$define_content);
 const _dynamicTag = /* @__PURE__ */_$.dynamicTag("#text/0");
 const _MyTag = /* @__PURE__ */_$.value("MyTag", (_scope, MyTag) => _dynamicTag(_scope, MyTag));
 const _x_effect = _$.effect("__tests__/template.marko_0_x", (_scope, {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/html.expected/template.js
index b5059684aa..535d8be0a7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/html.expected/template.js
@@ -1,9 +1,9 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const MyTag = {
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       _$.write(`<div>${_$.escapeXML(x)}${_$.markResumeNode(_scope1_id, "#text/0")}</div>`);
       _$.writeEffect(_scope1_id, "__tests__/template.marko_1_x/subscriber");
@@ -11,7 +11,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
         _: _$.ensureScopeWithId(_scope0_id)
       }, "__tests__/template.marko", "2:2");
       _$.resumeClosestBranch(_scope1_id);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   };
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", MyTag, {});
@@ -20,10 +20,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     x,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(MyTag)
+    "#text/0(": _$.dynamicTagId(MyTag)
   }, "__tests__/template.marko", 0, {
     x: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/ssr.expected.md
index 62dc5919ff..15d09f0c8f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render-closure/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[2--><div>1<!--M_*2 #text/0--></div><!--M_]1 #text/0--><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:_.a={x:1,"#text/0!":_.b={}},2:_.b},_.b._=_.a,_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c),2,"__tests__/template.marko_1_x/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()</script>
+  <!--M_[2--><div>1<!--M_*2 #text/0--></div><!--M_]1 #text/0--><button>1<!--M_*1 #text/2--></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:_.a={x:1,"#text/0!":_.b={},"#text/0(":"__tests__/template.marko_1_renderer"},2:_.b},_.b._=_.a,_.c),2,"__tests__/template.marko_1_x/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()</script>
 ```
 
 # Render End
@@ -20,7 +20,7 @@
     </button>
     <!--M_*1 #button/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={x:1,"#text/0!":_.b={}},2:_.b},_.b._=_.a,_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c),2,"__tests__/template.marko_1_x/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={x:1,"#text/0!":_.b={},"#text/0(":"__tests__/template.marko_1_renderer"},2:_.b},_.b._=_.a,_.c),2,"__tests__/template.marko_1_x/subscriber",1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/dom.expected/template.hydrate.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/dom.expected/template.hydrate.js
index 259dc2d4a8..8594b68d0f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/dom.expected/template.hydrate.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/dom.expected/template.hydrate.js
@@ -1,4 +1,4 @@
-// size: 349 (min) 210 (brotli)
+// size: 141 (min) 112 (brotli)
 const _y$define_content_effect = _$.effect("a1", (_scope, { 7: y }) =>
     _$.on(_scope[2], "click", function () {
       _y$define_content(_scope, y + 1);
@@ -8,23 +8,5 @@ const _y$define_content_effect = _$.effect("a1", (_scope, { 7: y }) =>
     _$.data(_scope[1], y),
       _$.data(_scope[3], y),
       _y$define_content_effect(_scope);
-  }),
-  _name$define_content = _$.value(6, (_scope, name) =>
-    _$.data(_scope[0], name),
-  ),
-  _pattern_$define_content = _$.value(5, (_scope, _pattern_) =>
-    _name$define_content(_scope, _pattern_.name),
-  ),
-  _params_2$define_content = _$.value(4, (_scope, _params_2) =>
-    _pattern_$define_content(_scope, _params_2?.[0]),
-  );
-_$.registerContent(
-  "a0",
-  "<div>Hello <!> <!></div><button> </button>",
-  "Db%c%l D ",
-  (_scope) => {
-    _y$define_content(_scope, 1);
-  },
-  () => _params_2$define_content,
-),
-  init();
+  });
+init();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/dom.expected/template.js
index f95f276a92..3dba49b588 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/dom.expected/template.js
@@ -17,7 +17,7 @@ const _params_2$define_content = /* @__PURE__ */_$.value("_params_2", (_scope, _
 const _setup$define_content = _scope => {
   _y$define_content(_scope, 1);
 };
-const _define_content = _$.registerContent("__tests__/template.marko_1_renderer", "<div>Hello <!> <!></div><button> </button>", /* next(1), over(1), replace, over(2), replace, out(1), get, next(1), get */"Db%c%l D ", _setup$define_content, () => _params_2$define_content);
+const _define_content = /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", "<div>Hello <!> <!></div><button> </button>", /* next(1), over(1), replace, over(2), replace, out(1), get, next(1), get */"Db%c%l D ", _setup$define_content, () => _params_2$define_content);
 const _dynamicTag = /* @__PURE__ */_$.dynamicTag("#text/0");
 const _MyTag = /* @__PURE__ */_$.value("MyTag", (_scope, MyTag) => _dynamicTag(_scope, MyTag, () => ({
   name: "Ryan"
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/html.expected/template.js
index 84efb49fad..46f41baf06 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/html.expected/template.js
@@ -1,8 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const MyTag = {
-    content: _$.register(/* @__PURE__ */_$.createRenderer(({
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", ({
       name
     }) => {
       const _scope1_id = _$.nextScopeId();
@@ -15,7 +15,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
         y: "2:8"
       });
       _$.resumeClosestBranch(_scope1_id);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   };
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", MyTag, {
@@ -23,7 +23,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   });
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(MyTag)
+    "#text/0(": _$.dynamicTagId(MyTag)
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/resume.expected.md
index 0e4b0f55fe..bfb2e2fc3c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/resume.expected.md
@@ -21,7 +21,7 @@
     <!--M_*2 #button/2-->
     <!--M_]1 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#text/0!":_.b={y:1}},2:_.b},_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c),2,"__tests__/template.marko_1_y",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{"#text/0!":_.a={y:1},"#text/0(":"__tests__/template.marko_1_renderer"},2:_.a}),2,"__tests__/template.marko_1_y",0];M._.w()
     </script>
   </body>
 </html>
@@ -59,7 +59,7 @@ container.querySelector("button").click();
     <!--M_*2 #button/2-->
     <!--M_]1 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#text/0!":_.b={y:1}},2:_.b},_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c),2,"__tests__/template.marko_1_y",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{"#text/0!":_.a={y:1},"#text/0(":"__tests__/template.marko_1_renderer"},2:_.a}),2,"__tests__/template.marko_1_y",0];M._.w()
     </script>
   </body>
 </html>
@@ -97,7 +97,7 @@ container.querySelector("button").click();
     <!--M_*2 #button/2-->
     <!--M_]1 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#text/0!":_.b={y:1}},2:_.b},_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c),2,"__tests__/template.marko_1_y",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{"#text/0!":_.a={y:1},"#text/0(":"__tests__/template.marko_1_renderer"},2:_.a}),2,"__tests__/template.marko_1_y",0];M._.w()
     </script>
   </body>
 </html>
@@ -135,7 +135,7 @@ container.querySelector("button").click();
     <!--M_*2 #button/2-->
     <!--M_]1 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#text/0!":_.b={y:1}},2:_.b},_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c),2,"__tests__/template.marko_1_y",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{"#text/0!":_.a={y:1},"#text/0(":"__tests__/template.marko_1_renderer"},2:_.a}),2,"__tests__/template.marko_1_y",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/ssr.expected.md
index c0dd9f290b..a0f427e3e2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-render/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[2--><div>Hello <!>Ryan<!--M_*2 #text/0--> <!>1<!--M_*2 #text/1--></div><button>1<!--M_*2 #text/3--></button><!--M_*2 #button/2--><!--M_]1 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:_.a={"#text/0!":_.b={y:1}},2:_.b},_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c),2,"__tests__/template.marko_1_y",0];M._.w()</script>
+  <!--M_[2--><div>Hello <!>Ryan<!--M_*2 #text/0--> <!>1<!--M_*2 #text/1--></div><button>1<!--M_*2 #text/3--></button><!--M_*2 #button/2--><!--M_]1 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:{"#text/0!":_.a={y:1},"#text/0(":"__tests__/template.marko_1_renderer"},2:_.a}),2,"__tests__/template.marko_1_y",0];M._.w()</script>
 ```
 
 # Render End
@@ -26,7 +26,7 @@
     <!--M_*2 #button/2-->
     <!--M_]1 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#text/0!":_.b={y:1}},2:_.b},_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c),2,"__tests__/template.marko_1_y",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{"#text/0!":_.a={y:1},"#text/0(":"__tests__/template.marko_1_renderer"},2:_.a}),2,"__tests__/template.marko_1_y",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/doctype/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/doctype/__snapshots__/html.expected/template.js
index faf6d82f53..2328c0fac6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/doctype/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/doctype/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<!DOCTYPE html><html><head><title>Title of the document</title></head><body>The content of the document......"), _$.writeTrailers("</body></html>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/html.expected/template.js
index 1b19305932..dbc2b2525b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dollar-global-client/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   let _ifScopeId2, _ifBranch2;
@@ -35,5 +35,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     show: "2:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.hydrate.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.hydrate.js
index aa47690d74..ae3036f417 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.hydrate.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.hydrate.js
@@ -1,4 +1,4 @@
-// size: 367 (min) 182 (brotli)
+// size: 233 (min) 143 (brotli)
 const _c$if_content = _$.registerDynamicClosure(
     "b0",
     4,
@@ -8,17 +8,9 @@ const _c$if_content = _$.registerDynamicClosure(
   _c$customTag_content = _$.registerDynamicClosure("b2", 4, (_scope, c) =>
     _$.data(_scope[2], c),
   ),
-  _b$customTag_content = _$.dynamicClosure(3, (_scope, b) =>
-    _$.data(_scope[1], b),
-  );
-_$.registerContent("b1", "<!> <!> <!>", "%c%c%", (_scope) => {
-  _$.data(_scope[0], 1),
-    _b$customTag_content._(_scope),
-    _c$customTag_content._(_scope);
-});
-const _c = _$.state(4, (_scope, c) => {
-  _c$customTag_content(_scope), _c$if_content(_scope);
-});
+  _c = _$.state(4, (_scope, c) => {
+    _c$customTag_content(_scope), _c$if_content(_scope);
+  });
 _$.effect("b3", (_scope) =>
   _$.on(_scope[0], "click", function () {
     _c(_scope, 4);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.js
index f14cbbf419..ffebc4b175 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.js
@@ -23,7 +23,7 @@ const _setup$customTag_content = _scope => {
   _b$customTag_content._(_scope);
   _c$customTag_content._(_scope);
 };
-const _customTag_content = _$.registerContent("__tests__/template.marko_1_renderer", "<!> <!> <!>", /* replace, over(2), replace, over(2), replace */"%c%c%", _setup$customTag_content);
+const _customTag_content = /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", "<!> <!> <!>", /* replace, over(2), replace, over(2), replace */"%c%c%", _setup$customTag_content);
 const _if = /* @__PURE__ */_$.conditional("#div/2", _if_content);
 const _c = /* @__PURE__ */_$.state("c/4", (_scope, c) => {
   _c$customTag_content(_scope);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/tags/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/tags/custom-tag.js
index 471bf342c8..5fad76b784 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/tags/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/tags/custom-tag.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div>");
   const _dynamicScope = _$.peekNextScope();
@@ -7,7 +7,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.write("</div>");
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(input.content)
+    "#text/0(": _$.dynamicTagId(input.content)
   }, "__tests__/tags/custom-tag.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/template.js
index 0f9a419dda..ad17074ec6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/template.js
@@ -1,13 +1,13 @@
 const a = 1;
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _customTag from "./tags/custom-tag.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const b = 2;
   const c = 3;
   _$.write(`<button></button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
   _customTag({
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       _$.write(`${_$.escapeXML(a)} ${_$.escapeXML(b)} <!>${_$.escapeXML(c)}${_$.markResumeNode(_scope1_id, "#text/2")}`);
       _$.writeEffect(_scope1_id, "__tests__/template.marko_1_c/subscriber");
@@ -15,7 +15,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
         _: _$.ensureScopeWithId(_scope0_id)
       }, "__tests__/template.marko", "6:2");
       _$.resumeClosestBranch(_scope1_id);
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   });
   _$.write("<div>");
   if (Math.random()) {
@@ -42,5 +42,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     c: "3:5"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/resume.expected.md
index bd2fc97bf1..df4dfbaf58 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/resume.expected.md
@@ -20,7 +20,7 @@
       <!--M_*5 #text/2-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={b:2,c:3},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b,4:_.c={_:_.a},5:{_:_.c}}),3,"__tests__/template.marko_1_c/subscriber",5,"__tests__/template.marko_3_c/subscriber",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={b:2,c:3},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c={_:_.a},5:{_:_.c}}),3,"__tests__/template.marko_1_c/subscriber",5,"__tests__/template.marko_3_c/subscriber",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
@@ -52,7 +52,7 @@ container.querySelector("button").click();
       <!--M_*5 #text/2-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={b:2,c:3},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b,4:_.c={_:_.a},5:{_:_.c}}),3,"__tests__/template.marko_1_c/subscriber",5,"__tests__/template.marko_3_c/subscriber",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={b:2,c:3},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c={_:_.a},5:{_:_.c}}),3,"__tests__/template.marko_1_c/subscriber",5,"__tests__/template.marko_3_c/subscriber",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/ssr.expected.md
index 4fcabe6f03..5f06e03699 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button></button><!--M_*1 #button/0--><div><!--M_[3-->1 2 <!>3<!--M_*3 #text/2--><!--M_]2 #text/0--></div><div>1 2 <!>3<!--M_*5 #text/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={b:2,c:3},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b,4:_.c={_:_.a},5:{_:_.c}}),3,"__tests__/template.marko_1_c/subscriber",5,"__tests__/template.marko_3_c/subscriber",1,"__tests__/template.marko_0",0];M._.w()</script>
+  <button></button><!--M_*1 #button/0--><div><!--M_[3-->1 2 <!>3<!--M_*3 #text/2--><!--M_]2 #text/0--></div><div>1 2 <!>3<!--M_*5 #text/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={b:2,c:3},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c={_:_.a},5:{_:_.c}}),3,"__tests__/template.marko_1_c/subscriber",5,"__tests__/template.marko_3_c/subscriber",1,"__tests__/template.marko_0",0];M._.w()</script>
 ```
 
 # Render End
@@ -25,7 +25,7 @@
       <!--M_*5 #text/2-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={b:2,c:3},2:{"#text/0!":_.b={_:_.a},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b,4:_.c={_:_.a},5:{_:_.c}}),3,"__tests__/template.marko_1_c/subscriber",5,"__tests__/template.marko_3_c/subscriber",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={b:2,c:3},2:{"#text/0!":_.b={_:_.a},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c={_:_.a},5:{_:_.c}}),3,"__tests__/template.marko_1_c/subscriber",5,"__tests__/template.marko_3_c/subscriber",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/html.expected/template.js
index 2e8d09e497..67f3b822d3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-event-handlers/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   _$.write(`<button>${_$.escapeXML(clickCount)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/html.expected/template.js
index 37fa9ed555..8661d09b67 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-native-dynamic-tag/__snapshots__/html.expected/template.js
@@ -1,26 +1,25 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const tagName = "span";
   const className = "A";
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", tagName, {
     class: className
-  }, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  }, _$.registerContent("__tests__/template.marko_1_renderer", () => {
     const _scope1_id = _$.nextScopeId();
     _$.write("body content");
-  }), "__tests__/template.marko_1_renderer", _scope0_id));
+  }, _scope0_id));
   _$.write(`<button></button>${_$.markResumeNode(_scope0_id, "#button/1")}`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0_tagName");
   _$.writeScope(_scope0_id, {
     tagName,
     className,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(tagName)
+    "#text/0(": _$.dynamicTagId(tagName)
   }, "__tests__/template.marko", 0, {
     tagName: "1:6",
     className: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/tags/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/tags/custom-tag.js
index 9bc4bb7195..f0fd56d34b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/tags/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/tags/custom-tag.js
@@ -1,8 +1,7 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div>Child: <!>${_$.escapeXML(input)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
   const _return = input;
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/template.js
index 9a48704359..12e216b3b2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/template.js
@@ -1,7 +1,7 @@
 import customTag from './tags/custom-tag.marko';
 const tags = [customTag];
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   _$.write(`<button>Count: <!>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -13,10 +13,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     x,
     "#text/2!": _$.writeExistingScope(_dynamicScope),
-    "#text/2(": _$.normalizeDynamicRenderer(tags[0])
+    "#text/2(": _$.dynamicTagId(tags[0])
   }, "__tests__/template.marko", 0, {
     x: "3:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/resume.expected.md
index de6c5023e9..a9ede96718 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/resume.expected.md
@@ -25,7 +25,7 @@
       <!--M_*1 #text/4-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#scopeOffset/3":3,x:1,"#text/2!":_.b={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.b},_.b["/"]=_._["__tests__/template.marko_0_y/var"](_.a),_.c),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#scopeOffset/3":3,x:1,"#text/2!":_.b={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.b},_.b["/"]=_._["__tests__/template.marko_0_y/var"](_.a),_.c),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -62,7 +62,7 @@ container.querySelector("button").click();
       <!--M_*1 #text/4-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#scopeOffset/3":3,x:1,"#text/2!":_.b={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.b},_.b["/"]=_._["__tests__/template.marko_0_y/var"](_.a),_.c),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#scopeOffset/3":3,x:1,"#text/2!":_.b={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.b},_.b["/"]=_._["__tests__/template.marko_0_y/var"](_.a),_.c),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -105,7 +105,7 @@ container.querySelector("button").click();
       <!--M_*1 #text/4-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#scopeOffset/3":3,x:1,"#text/2!":_.b={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.b},_.b["/"]=_._["__tests__/template.marko_0_y/var"](_.a),_.c),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#scopeOffset/3":3,x:1,"#text/2!":_.b={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.b},_.b["/"]=_._["__tests__/template.marko_0_y/var"](_.a),_.c),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -148,7 +148,7 @@ container.querySelector("button").click();
       <!--M_*1 #text/4-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#scopeOffset/3":3,x:1,"#text/2!":_.b={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.b},_.b["/"]=_._["__tests__/template.marko_0_y/var"](_.a),_.c),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#scopeOffset/3":3,x:1,"#text/2!":_.b={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.b},_.b["/"]=_._["__tests__/template.marko_0_y/var"](_.a),_.c),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/ssr.expected.md
index 6f77b92ac9..4d5e24995c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Count: <!>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[2--><div>Child: <!>1<!--M_*2 #text/0--></div><!--M_]1 #text/2--><div>Parent: <!>1<!--M_*1 #text/4--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:_.a={"#scopeOffset/3":3,x:1,"#text/2!":_.b={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.b},_.b["/"]=_._["__tests__/template.marko_0_y/var"](_.a),_.c),1,"__tests__/template.marko_0_x",0];M._.w()</script>
+  <button>Count: <!>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[2--><div>Child: <!>1<!--M_*2 #text/0--></div><!--M_]1 #text/2--><div>Parent: <!>1<!--M_*1 #text/4--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:_.a={"#scopeOffset/3":3,x:1,"#text/2!":_.b={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.b},_.b["/"]=_._["__tests__/template.marko_0_y/var"](_.a),_.c),1,"__tests__/template.marko_0_x",0];M._.w()</script>
 ```
 
 # Render End
@@ -30,7 +30,7 @@
       <!--M_*1 #text/4-->
     </div>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#scopeOffset/3":3,x:1,"#text/2!":_.b={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.b},_.b["/"]=_._["__tests__/template.marko_0_y/var"](_.a),_.c),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.a={"#scopeOffset/3":3,x:1,"#text/2!":_.b={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.b},_.b["/"]=_._["__tests__/template.marko_0_y/var"](_.a),_.c),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/tags/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/tags/custom-tag.js
index fa0ca766da..3e27651349 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/tags/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/tags/custom-tag.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div>${_$.escapeXML(input)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/template.js
index ac8396277b..0f9f129909 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/template.js
@@ -1,7 +1,7 @@
 import customTag from './tags/custom-tag.marko';
 const tags = [customTag];
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   _$.write(`<button>Count: <!>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -11,10 +11,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     x,
     "#text/2!": _$.writeExistingScope(_dynamicScope),
-    "#text/2(": _$.normalizeDynamicRenderer(tags[0])
+    "#text/2(": _$.dynamicTagId(tags[0])
   }, "__tests__/template.marko", 0, {
     x: "3:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/resume.expected.md
index 1e77d8c9db..049dd82548 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/resume.expected.md
@@ -17,7 +17,7 @@
     </div>
     <!--M_]1 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -46,7 +46,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]1 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -80,7 +80,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]1 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -114,7 +114,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]1 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md
index 7b7e9318e0..866d5f31ff 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Count: <!>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[2--><div>1<!--M_*2 #text/0--></div><!--M_]1 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()</script>
+  <button>Count: <!>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[2--><div>1<!--M_*2 #text/0--></div><!--M_]1 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()</script>
 ```
 
 # Render End
@@ -22,7 +22,7 @@
     </div>
     <!--M_]1 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/html.expected/template.js
index 2437efd204..97d8d34478 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-attr-signal/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const className = "A";
   _$.write(`<p${_$.classAttr(className)}>paragraph</p>${_$.markResumeNode(_scope0_id, "#p/0")}<button></button>${_$.markResumeNode(_scope0_id, "#button/1")}`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     className: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/tags/child.js
index 211ccd9852..fbed648fea 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/tags/child.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     id
   } = input;
   _$.write(`<div>Id is <!>${_$.escapeXML(id)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/template.js
index 8ae2a6b15d..3f50b54f42 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const tagName = child;
   _$.write(`<button></button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -12,10 +12,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     tagName,
     "#text/1!": _$.writeExistingScope(_dynamicScope),
-    "#text/1(": _$.normalizeDynamicRenderer(tagName)
+    "#text/1(": _$.dynamicTagId(tagName)
   }, "__tests__/template.marko", 0, {
     tagName: "3:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md
index 6a73ecdbc5..db525968e2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md
@@ -14,7 +14,7 @@
     </div>
     <!--M_]1 #text/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child.marko"],"#text/1!":_.a={},"#text/1(":_._["__tests__/tags/child.marko"]},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child.marko"],"#text/1!":_.a={},"#text/1(":"__tests__/tags/child.marko"},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
     </script>
   </body>
 </html>
@@ -36,7 +36,7 @@ container.querySelector("button").click();
     />
     <!--M_]1 #text/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child.marko"],"#text/1!":_.a={},"#text/1(":_._["__tests__/tags/child.marko"]},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child.marko"],"#text/1!":_.a={},"#text/1(":"__tests__/tags/child.marko"},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
     </script>
   </body>
 </html>
@@ -65,7 +65,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]1 #text/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child.marko"],"#text/1!":_.a={},"#text/1(":_._["__tests__/tags/child.marko"]},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child.marko"],"#text/1!":_.a={},"#text/1(":"__tests__/tags/child.marko"},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md
index 62980ebdb9..884d51262c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button></button><!--M_*1 #button/0--><!--M_[2--><div>Id is <!>dynamic<!--M_*2 #text/0--></div><!--M_]1 #text/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:{tagName:_._["__tests__/tags/child.marko"],"#text/1!":_.a={},"#text/1(":_._["__tests__/tags/child.marko"]},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()</script>
+  <button></button><!--M_*1 #button/0--><!--M_[2--><div>Id is <!>dynamic<!--M_*2 #text/0--></div><!--M_]1 #text/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:{tagName:_._["__tests__/tags/child.marko"],"#text/1!":_.a={},"#text/1(":"__tests__/tags/child.marko"},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()</script>
 ```
 
 # Render End
@@ -19,7 +19,7 @@
     </div>
     <!--M_]1 #text/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child.marko"],"#text/1!":_.a={},"#text/1(":_._["__tests__/tags/child.marko"]},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child.marko"],"#text/1!":_.a={},"#text/1(":"__tests__/tags/child.marko"},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child1.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child1.js
index 89c429d994..e34af3a1d5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child1.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child1.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child1.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     value
   } = input;
   _$.write(`<div>Child 1 has <!>${_$.escapeXML(value)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child1.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child2.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child2.js
index 0f078195c6..1b968a5baa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child2.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child2.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child2.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     value
   } = input;
   _$.write(`<div>Child 2 has <!>${_$.escapeXML(value)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child2.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/template.js
index a6f41a5d1b..3fe971938e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/template.js
@@ -1,7 +1,7 @@
 import child1 from "./tags/child1.marko";
 import child2 from "./tags/child2.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const tagName = child1;
   const val = 3;
@@ -15,11 +15,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     tagName,
     val,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(tagName)
+    "#text/0(": _$.dynamicTagId(tagName)
   }, "__tests__/template.marko", 0, {
     tagName: "4:6",
     val: "5:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md
index 1d24d6b3b0..cc288b61c3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md
@@ -14,7 +14,7 @@
     <button />
     <!--M_*1 #button/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":_._["__tests__/tags/child1.marko"]},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":"__tests__/tags/child1.marko"},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
     </script>
   </body>
 </html>
@@ -41,7 +41,7 @@ container.querySelector("button").click();
     <button />
     <!--M_*1 #button/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":_._["__tests__/tags/child1.marko"]},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":"__tests__/tags/child1.marko"},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
     </script>
   </body>
 </html>
@@ -70,7 +70,7 @@ container.querySelector("button").click();
     <button />
     <!--M_*1 #button/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":_._["__tests__/tags/child1.marko"]},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":"__tests__/tags/child1.marko"},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/ssr.expected.md
index 405ffeeefb..68b5f6e251 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[2--><div>Child 1 has <!>3<!--M_*2 #text/0--></div><!--M_]1 #text/0--><button></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:{tagName:_._["__tests__/tags/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":_._["__tests__/tags/child1.marko"]},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()</script>
+  <!--M_[2--><div>Child 1 has <!>3<!--M_*2 #text/0--></div><!--M_]1 #text/0--><button></button><!--M_*1 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:{tagName:_._["__tests__/tags/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":"__tests__/tags/child1.marko"},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()</script>
 ```
 
 # Render End
@@ -19,7 +19,7 @@
     <button />
     <!--M_*1 #button/1-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":_._["__tests__/tags/child1.marko"]},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{tagName:_._["__tests__/tags/child1.marko"],val:3,"#text/0!":_.a={},"#text/0(":"__tests__/tags/child1.marko"},2:_.a}),1,"__tests__/template.marko_0_tagName",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/html.expected/tags/tag-a/index.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/html.expected/tags/tag-a/index.js
index fd5ca9d0c8..83cba33a7b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/html.expected/tags/tag-a/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/html.expected/tags/tag-a/index.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/tag-a/index.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     class: className,
@@ -12,7 +12,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.write(`</div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
   _$.writeScope(_scope0_id, {
     "#text/1!": _$.writeExistingScope(_dynamicScope),
-    "#text/1(": _$.normalizeDynamicRenderer(content)
+    "#text/1(": _$.dynamicTagId(content)
   }, "__tests__/tags/tag-a/index.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/tag-a/index.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/html.expected/tags/tag-b/index.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/html.expected/tags/tag-b/index.js
index 533ed09b5a..2e2e579ee1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/html.expected/tags/tag-b/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/html.expected/tags/tag-b/index.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/tag-b/index.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     class: className,
@@ -12,7 +12,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.write(`</div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
   _$.writeScope(_scope0_id, {
     "#text/1!": _$.writeExistingScope(_dynamicScope),
-    "#text/1(": _$.normalizeDynamicRenderer(content)
+    "#text/1(": _$.dynamicTagId(content)
   }, "__tests__/tags/tag-b/index.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/tag-b/index.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/html.expected/template.js
index 18aa906522..235475186f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/html.expected/template.js
@@ -2,7 +2,7 @@ import tagA from "./tags/tag-a/index.marko";
 import tagB from "./tags/tag-b/index.marko";
 const foo = '';
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     content,
@@ -53,10 +53,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.dynamicTagInput(_scope0_id, "#text/7", showTagA && tagA, {
     class: ["a", "b"],
     other: other
-  }, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  }, _$.registerContent("__tests__/template.marko_1_renderer", () => {
     const _scope1_id = _$.nextScopeId();
     _$.write("Body content");
-  }), "__tests__/template.marko_1_renderer", _scope0_id));
+  }, _scope0_id));
   const _dynamicScope9 = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/8", tag || tagA, {
     class: ["a", "b"],
@@ -116,43 +116,43 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     tagConstA,
     tagConstB,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(content),
+    "#text/0(": _$.dynamicTagId(content),
     "#text/1!": _$.writeExistingScope(_dynamicScope2),
-    "#text/1(": _$.normalizeDynamicRenderer(x),
+    "#text/1(": _$.dynamicTagId(x),
     "#text/2!": _$.writeExistingScope(_dynamicScope3),
-    "#text/2(": _$.normalizeDynamicRenderer(show ? "div" : null),
+    "#text/2(": _$.dynamicTagId(show ? "div" : null),
     "#text/3!": _$.writeExistingScope(_dynamicScope4),
-    "#text/3(": _$.normalizeDynamicRenderer(show && "div"),
+    "#text/3(": _$.dynamicTagId(show && "div"),
     "#text/4!": _$.writeExistingScope(_dynamicScope5),
-    "#text/4(": _$.normalizeDynamicRenderer(isLarge ? "h1" : "h2"),
+    "#text/4(": _$.dynamicTagId(isLarge ? "h1" : "h2"),
     "#text/5!": _$.writeExistingScope(_dynamicScope6),
-    "#text/5(": _$.normalizeDynamicRenderer(showTagA ? tagA : tagB),
+    "#text/5(": _$.dynamicTagId(showTagA ? tagA : tagB),
     "#text/6!": _$.writeExistingScope(_dynamicScope7),
-    "#text/6(": _$.normalizeDynamicRenderer(showTagA && tagA),
+    "#text/6(": _$.dynamicTagId(showTagA && tagA),
     "#text/7!": _$.writeExistingScope(_dynamicScope8),
-    "#text/7(": _$.normalizeDynamicRenderer(showTagA && tagA),
+    "#text/7(": _$.dynamicTagId(showTagA && tagA),
     "#text/8!": _$.writeExistingScope(_dynamicScope9),
-    "#text/8(": _$.normalizeDynamicRenderer(tag || tagA),
+    "#text/8(": _$.dynamicTagId(tag || tagA),
     "#text/9!": _$.writeExistingScope(_dynamicScope10),
-    "#text/9(": _$.normalizeDynamicRenderer(largeHeading || "h2"),
+    "#text/9(": _$.dynamicTagId(largeHeading || "h2"),
     "#text/10!": _$.writeExistingScope(_dynamicScope11),
-    "#text/10(": _$.normalizeDynamicRenderer(global.x = "a" + "b"),
+    "#text/10(": _$.dynamicTagId(global.x = "a" + "b"),
     "#text/11!": _$.writeExistingScope(_dynamicScope12),
-    "#text/11(": _$.normalizeDynamicRenderer("h" + level),
+    "#text/11(": _$.dynamicTagId("h" + level),
     "#text/12!": _$.writeExistingScope(_dynamicScope13),
-    "#text/12(": _$.normalizeDynamicRenderer(`h${level}`),
+    "#text/12(": _$.dynamicTagId(`h${level}`),
     "#text/13!": _$.writeExistingScope(_dynamicScope14),
-    "#text/13(": _$.normalizeDynamicRenderer(tagConstA),
+    "#text/13(": _$.dynamicTagId(tagConstA),
     "#text/14!": _$.writeExistingScope(_dynamicScope15),
-    "#text/14(": _$.normalizeDynamicRenderer(tagConstB),
+    "#text/14(": _$.dynamicTagId(tagConstB),
     "#text/15!": _$.writeExistingScope(_dynamicScope16),
-    "#text/15(": _$.normalizeDynamicRenderer(`h${1}`),
+    "#text/15(": _$.dynamicTagId(`h${1}`),
     "#text/16!": _$.writeExistingScope(_dynamicScope17),
-    "#text/16(": _$.normalizeDynamicRenderer(foo || 'div'),
+    "#text/16(": _$.dynamicTagId(foo || 'div'),
     "#text/17!": _$.writeExistingScope(_dynamicScope18),
-    "#text/17(": _$.normalizeDynamicRenderer(foo + 'div'),
+    "#text/17(": _$.dynamicTagId(foo + 'div'),
     "#text/18!": _$.writeExistingScope(_dynamicScope19),
-    "#text/18(": _$.normalizeDynamicRenderer("d" + "iv")
+    "#text/18(": _$.dynamicTagId("d" + "iv")
   }, "__tests__/template.marko", 0, {
     content: "5:10",
     x: "5:19",
@@ -166,5 +166,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     tagConstA: "30:8",
     tagConstB: "33:8"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/resume.expected.md
index 79d3d8f3db..2ab0712dc2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/resume.expected.md
@@ -55,7 +55,7 @@
     <div />
     <!--M_|1 #text/18 22-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.v={1:{tagConstA:"a",tagConstB:null,"#text/0!":_.a={},"#text/1!":_.b={},"#text/2!":_.c={},"#text/3!":_.d={},"#text/4!":_.e={},"#text/4(":"h2","#text/5!":_.f={"#text/1!":_.g={}},"#text/5(":_._["__tests__/tags/tag-b/index.marko"],"#text/6!":_.h={},"#text/7!":_.i={},"#text/8!":_.j={"#text/1!":_.k={}},"#text/8(":_._["__tests__/tags/tag-a/index.marko"],"#text/9!":_.l={},"#text/9(":"h2","#text/10!":_.m={},"#text/10(":"ab","#text/11!":_.n={},"#text/11(":"hundefined","#text/12!":_.o={},"#text/12(":"hundefined","#text/13!":_.p={},"#text/13(":"a","#text/14!":_.q={},"#text/15!":_.r={},"#text/15(":"h1","#text/16!":_.s={},"#text/16(":"div","#text/17!":_.t={},"#text/17(":"div","#text/18!":_.u={},"#text/18(":"div"},2:_.a,3:_.b,4:_.c,5:_.d,6:_.e,7:_.f,8:_.g,9:_.h,10:_.i,11:_.j,12:_.k,13:_.l,14:_.m,15:_.n,16:_.o,17:_.p,18:_.q,19:_.r,20:_.s,21:_.t,22:_.u}),0]
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.v={1:{tagConstA:"a",tagConstB:null,"#text/0!":_.a={},"#text/1!":_.b={},"#text/2!":_.c={},"#text/3!":_.d={},"#text/4!":_.e={},"#text/4(":"h2","#text/5!":_.f={"#text/1!":_.g={}},"#text/5(":"__tests__/tags/tag-b/index.marko","#text/6!":_.h={},"#text/7!":_.i={},"#text/8!":_.j={"#text/1!":_.k={}},"#text/8(":"__tests__/tags/tag-a/index.marko","#text/9!":_.l={},"#text/9(":"h2","#text/10!":_.m={},"#text/10(":"ab","#text/11!":_.n={},"#text/11(":"hundefined","#text/12!":_.o={},"#text/12(":"hundefined","#text/13!":_.p={},"#text/13(":"a","#text/14!":_.q={},"#text/15!":_.r={},"#text/15(":"h1","#text/16!":_.s={},"#text/16(":"div","#text/17!":_.t={},"#text/17(":"div","#text/18!":_.u={},"#text/18(":"div"},2:_.a,3:_.b,4:_.c,5:_.d,6:_.e,7:_.f,8:_.g,9:_.h,10:_.i,11:_.j,12:_.k,13:_.l,14:_.m,15:_.n,16:_.o,17:_.p,18:_.q,19:_.r,20:_.s,21:_.t,22:_.u}),0]
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/ssr.expected.md
index d1faa935ac..dbdd28a7e7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-name/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <h2 class="a b"></h2><!--M_|1 #text/4 6--><!--M_[7--><div class="a b">B </div><!--M_*7 #div/0--><!--M_]1 #text/5--><!--M_[10-->Body content<!--M_]1 #text/7--><!--M_[11--><div class="a b">A </div><!--M_*11 #div/0--><!--M_]1 #text/8--><h2 class="a b"></h2><!--M_|1 #text/9 13--><ab class="a b"></ab><!--M_|1 #text/10 14--><hundefined class="a b"></hundefined><!--M_|1 #text/11 15--><hundefined class="a b"></hundefined><!--M_|1 #text/12 16--><a class="a b"></a><!--M_|1 #text/13 17--><h1></h1><!--M_|1 #text/15 19--><div></div><!--M_|1 #text/16 20--><div></div><!--M_|1 #text/17 21--><div></div><!--M_|1 #text/18 22--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.v={1:{tagConstA:"a",tagConstB:null,"#text/0!":_.a={},"#text/1!":_.b={},"#text/2!":_.c={},"#text/3!":_.d={},"#text/4!":_.e={},"#text/4(":"h2","#text/5!":_.f={"#text/1!":_.g={}},"#text/5(":_._["__tests__/tags/tag-b/index.marko"],"#text/6!":_.h={},"#text/7!":_.i={},"#text/8!":_.j={"#text/1!":_.k={}},"#text/8(":_._["__tests__/tags/tag-a/index.marko"],"#text/9!":_.l={},"#text/9(":"h2","#text/10!":_.m={},"#text/10(":"ab","#text/11!":_.n={},"#text/11(":"hundefined","#text/12!":_.o={},"#text/12(":"hundefined","#text/13!":_.p={},"#text/13(":"a","#text/14!":_.q={},"#text/15!":_.r={},"#text/15(":"h1","#text/16!":_.s={},"#text/16(":"div","#text/17!":_.t={},"#text/17(":"div","#text/18!":_.u={},"#text/18(":"div"},2:_.a,3:_.b,4:_.c,5:_.d,6:_.e,7:_.f,8:_.g,9:_.h,10:_.i,11:_.j,12:_.k,13:_.l,14:_.m,15:_.n,16:_.o,17:_.p,18:_.q,19:_.r,20:_.s,21:_.t,22:_.u}),0]</script>
+  <h2 class="a b"></h2><!--M_|1 #text/4 6--><!--M_[7--><div class="a b">B </div><!--M_*7 #div/0--><!--M_]1 #text/5--><!--M_[10-->Body content<!--M_]1 #text/7--><!--M_[11--><div class="a b">A </div><!--M_*11 #div/0--><!--M_]1 #text/8--><h2 class="a b"></h2><!--M_|1 #text/9 13--><ab class="a b"></ab><!--M_|1 #text/10 14--><hundefined class="a b"></hundefined><!--M_|1 #text/11 15--><hundefined class="a b"></hundefined><!--M_|1 #text/12 16--><a class="a b"></a><!--M_|1 #text/13 17--><h1></h1><!--M_|1 #text/15 19--><div></div><!--M_|1 #text/16 20--><div></div><!--M_|1 #text/17 21--><div></div><!--M_|1 #text/18 22--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.v={1:{tagConstA:"a",tagConstB:null,"#text/0!":_.a={},"#text/1!":_.b={},"#text/2!":_.c={},"#text/3!":_.d={},"#text/4!":_.e={},"#text/4(":"h2","#text/5!":_.f={"#text/1!":_.g={}},"#text/5(":"__tests__/tags/tag-b/index.marko","#text/6!":_.h={},"#text/7!":_.i={},"#text/8!":_.j={"#text/1!":_.k={}},"#text/8(":"__tests__/tags/tag-a/index.marko","#text/9!":_.l={},"#text/9(":"h2","#text/10!":_.m={},"#text/10(":"ab","#text/11!":_.n={},"#text/11(":"hundefined","#text/12!":_.o={},"#text/12(":"hundefined","#text/13!":_.p={},"#text/13(":"a","#text/14!":_.q={},"#text/15!":_.r={},"#text/15(":"h1","#text/16!":_.s={},"#text/16(":"div","#text/17!":_.t={},"#text/17(":"div","#text/18!":_.u={},"#text/18(":"div"},2:_.a,3:_.b,4:_.c,5:_.d,6:_.e,7:_.f,8:_.g,9:_.h,10:_.i,11:_.j,12:_.k,13:_.l,14:_.m,15:_.n,16:_.o,17:_.p,18:_.q,19:_.r,20:_.s,21:_.t,22:_.u}),0]</script>
 ```
 
 # Render End
@@ -60,7 +60,7 @@
     <div />
     <!--M_|1 #text/18 22-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.v={1:{tagConstA:"a",tagConstB:null,"#text/0!":_.a={},"#text/1!":_.b={},"#text/2!":_.c={},"#text/3!":_.d={},"#text/4!":_.e={},"#text/4(":"h2","#text/5!":_.f={"#text/1!":_.g={}},"#text/5(":_._["__tests__/tags/tag-b/index.marko"],"#text/6!":_.h={},"#text/7!":_.i={},"#text/8!":_.j={"#text/1!":_.k={}},"#text/8(":_._["__tests__/tags/tag-a/index.marko"],"#text/9!":_.l={},"#text/9(":"h2","#text/10!":_.m={},"#text/10(":"ab","#text/11!":_.n={},"#text/11(":"hundefined","#text/12!":_.o={},"#text/12(":"hundefined","#text/13!":_.p={},"#text/13(":"a","#text/14!":_.q={},"#text/15!":_.r={},"#text/15(":"h1","#text/16!":_.s={},"#text/16(":"div","#text/17!":_.t={},"#text/17(":"div","#text/18!":_.u={},"#text/18(":"div"},2:_.a,3:_.b,4:_.c,5:_.d,6:_.e,7:_.f,8:_.g,9:_.h,10:_.i,11:_.j,12:_.k,13:_.l,14:_.m,15:_.n,16:_.o,17:_.p,18:_.q,19:_.r,20:_.s,21:_.t,22:_.u}),0]
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.v={1:{tagConstA:"a",tagConstB:null,"#text/0!":_.a={},"#text/1!":_.b={},"#text/2!":_.c={},"#text/3!":_.d={},"#text/4!":_.e={},"#text/4(":"h2","#text/5!":_.f={"#text/1!":_.g={}},"#text/5(":"__tests__/tags/tag-b/index.marko","#text/6!":_.h={},"#text/7!":_.i={},"#text/8!":_.j={"#text/1!":_.k={}},"#text/8(":"__tests__/tags/tag-a/index.marko","#text/9!":_.l={},"#text/9(":"h2","#text/10!":_.m={},"#text/10(":"ab","#text/11!":_.n={},"#text/11(":"hundefined","#text/12!":_.o={},"#text/12(":"hundefined","#text/13!":_.p={},"#text/13(":"a","#text/14!":_.q={},"#text/15!":_.r={},"#text/15(":"h1","#text/16!":_.s={},"#text/16(":"div","#text/17!":_.t={},"#text/17(":"div","#text/18!":_.u={},"#text/18(":"div"},2:_.a,3:_.b,4:_.c,5:_.d,6:_.e,7:_.f,8:_.g,9:_.h,10:_.i,11:_.j,12:_.k,13:_.l,14:_.m,15:_.n,16:_.o,17:_.p,18:_.q,19:_.r,20:_.s,21:_.t,22:_.u}),0]
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-native/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-native/__snapshots__/html.expected/template.js
index 3ff9e621e3..ef077549a5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-native/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-native/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<p class=par>paragraph</p>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/tags/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/tags/custom-tag.js
index 36d4b24cc5..6df42b79d9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/tags/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/tags/custom-tag.js
@@ -1,8 +1,7 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div>${_$.escapeXML(input)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
   const _return = "hello from other";
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/template.js
index 8ded2d5ff9..f789536d43 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/template.js
@@ -1,7 +1,7 @@
 import customTag from './tags/custom-tag.marko';
 const tags = [customTag];
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   _$.write(`<button>Count: <!>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -11,10 +11,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     x,
     "#text/2!": _$.writeExistingScope(_dynamicScope),
-    "#text/2(": _$.normalizeDynamicRenderer(tags[0])
+    "#text/2(": _$.dynamicTagId(tags[0])
   }, "__tests__/template.marko", 0, {
     x: "3:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/resume.expected.md
index 1e77d8c9db..049dd82548 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/resume.expected.md
@@ -17,7 +17,7 @@
     </div>
     <!--M_]1 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -46,7 +46,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]1 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -80,7 +80,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]1 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
@@ -114,7 +114,7 @@ container.querySelector("button").click();
     </div>
     <!--M_]1 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md
index 7b7e9318e0..866d5f31ff 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <button>Count: <!>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[2--><div>1<!--M_*2 #text/0--></div><!--M_]1 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()</script>
+  <button>Count: <!>1<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_[2--><div>1<!--M_*2 #text/0--></div><!--M_]1 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()</script>
 ```
 
 # Render End
@@ -22,7 +22,7 @@
     </div>
     <!--M_]1 #text/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":_._["__tests__/tags/custom-tag.marko"]},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{x:1,"#text/2!":_.a={},"#text/2(":"__tests__/tags/custom-tag.marko"},2:_.a}),1,"__tests__/template.marko_0_x",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/html.expected/template.js
index e4c2e5fc54..5afca5ed0e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-sometimes-null/__snapshots__/html.expected/template.js
@@ -1,21 +1,20 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = null;
   const _dynamicScope = _$.peekNextScope();
-  _$.dynamicTagInput(_scope0_id, "#text/0", x, {}, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  _$.dynamicTagInput(_scope0_id, "#text/0", x, {}, _$.registerContent("__tests__/template.marko_1_renderer", () => {
     const _scope1_id = _$.nextScopeId();
     _$.write("Body Content");
-  }), "__tests__/template.marko_1_renderer", _scope0_id));
+  }, _scope0_id));
   _$.write(`<button></button>${_$.markResumeNode(_scope0_id, "#button/1")}`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0_x");
   _$.writeScope(_scope0_id, {
     x,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(x)
+    "#text/0(": _$.dynamicTagId(x)
   }, "__tests__/template.marko", 0, {
     x: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/tags/counter.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/tags/counter.js
index 8c187ccdbf..8a5299bd80 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/tags/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/tags/counter.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   _$.write(`<button class=inc>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   });
   _$.resumeClosestBranch(_scope0_id);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/template.js
index b529734410..636623d90a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/template.js
@@ -4,7 +4,7 @@ function getCounter() {
 }
 _$.register(getCounter, "__tests__/template.marko_0/getCounter");
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _dynamicScope = _$.peekNextScope();
   const count = _$.dynamicTagInput(_scope0_id, "#text/0", getCounter(), {}, void 0);
@@ -13,7 +13,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(getCounter())
+    "#text/0(": _$.dynamicTagId(getCounter())
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/resume.expected.md
index 6d425832db..fb4d87680c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/resume.expected.md
@@ -19,7 +19,7 @@
     </button>
     <!--M_*1 #button/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":_._["__tests__/tags/counter.marko"]},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":"__tests__/tags/counter.marko"},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
@@ -55,7 +55,7 @@ container.querySelector("button.inc").click();
     </button>
     <!--M_*1 #button/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":_._["__tests__/tags/counter.marko"]},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":"__tests__/tags/counter.marko"},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
@@ -90,7 +90,7 @@ container.querySelector("button.inc").click();
     </button>
     <!--M_*1 #button/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":_._["__tests__/tags/counter.marko"]},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":"__tests__/tags/counter.marko"},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
@@ -125,7 +125,7 @@ container.querySelector("button.reset").click();
     </button>
     <!--M_*1 #button/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":_._["__tests__/tags/counter.marko"]},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":"__tests__/tags/counter.marko"},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
@@ -160,7 +160,7 @@ container.querySelector("button.inc").click();
     </button>
     <!--M_*1 #button/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":_._["__tests__/tags/counter.marko"]},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":"__tests__/tags/counter.marko"},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/ssr.expected.md
index 78e7600499..ffc7d0bea3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[2--><button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_]1 #text/0--><button class=reset>reset</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":_._["__tests__/tags/counter.marko"]},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()</script>
+  <!--M_[2--><button class=inc>1<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_]1 #text/0--><button class=reset>reset</button><!--M_*1 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":"__tests__/tags/counter.marko"},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()</script>
 ```
 
 # Render End
@@ -24,7 +24,7 @@
     </button>
     <!--M_*1 #button/2-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":_._["__tests__/tags/counter.marko"]},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={1:_.b={"#scopeOffset/1":3,"#text/0!":_.a={x:1},"#text/0(":"__tests__/tags/counter.marko"},2:_.a},_.a["@"]=_._["__tests__/tags/counter.marko_0/valueChange"](_.a),_.a["/"]=_._["__tests__/template.marko_0_count/var"](_.b),_.c),2,"__tests__/tags/counter.marko_0_x",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/tags/child/index.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/tags/child/index.js
index e92b788b9e..8022abb972 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/tags/child/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/tags/child/index.js
@@ -1,7 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child/index.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _return = 1;
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child/index.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/template.js
index a6547747d7..806126b658 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import child from "./tags/child/index.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _childScope = _$.peekNextScope();
   const data1 = child({});
@@ -17,11 +17,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     "#childScope/0": _$.writeExistingScope(_childScope),
     "#text/2!": _$.writeExistingScope(_dynamicScope),
-    "#text/2(": _$.normalizeDynamicRenderer(input.show && child),
+    "#text/2(": _$.dynamicTagId(input.show && child),
     "#text/4!": _$.writeExistingScope(_dynamicScope2),
-    "#text/4(": _$.normalizeDynamicRenderer(input.dynamic),
+    "#text/4(": _$.dynamicTagId(input.dynamic),
     "#text/6!": _$.writeExistingScope(_dynamicScope3),
-    "#text/6(": _$.normalizeDynamicRenderer(input.show && "div")
+    "#text/6(": _$.dynamicTagId(input.show && "div")
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/tags/counter.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/tags/counter.js
index 9fc73e365c..85f4ac64a2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/tags/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/tags/counter.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<button id=count>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "1:5"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/template.js
index 7a07f04195..b70f0fe353 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/template.js
@@ -1,22 +1,21 @@
 import _counter from "./tags/counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const tagName = "div";
   const _dynamicScope = _$.peekNextScope();
-  _$.dynamicTagInput(_scope0_id, "#text/0", tagName, {}, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  _$.dynamicTagInput(_scope0_id, "#text/0", tagName, {}, _$.registerContent("__tests__/template.marko_1_renderer", () => {
     const _scope1_id = _$.nextScopeId();
     _counter({});
-  }), "__tests__/template.marko_1_renderer", _scope0_id));
+  }, _scope0_id));
   _$.write(`<button id=changeTag></button>${_$.markResumeNode(_scope0_id, "#button/1")}`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0_tagName");
   _$.writeScope(_scope0_id, {
     tagName,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(tagName)
+    "#text/0(": _$.dynamicTagId(tagName)
   }, "__tests__/template.marko", 0, {
     tagName: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/empty-child-template/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/empty-child-template/__snapshots__/html.expected/tags/child.js
index 3a2fbc8953..51821a2d4f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/empty-child-template/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/empty-child-template/__snapshots__/html.expected/tags/child.js
@@ -1,3 +1,2 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/empty-child-template/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/empty-child-template/__snapshots__/html.expected/template.js
index 1b972d61bf..1889303b00 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/empty-child-template/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/empty-child-template/__snapshots__/html.expected/template.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div>");
   _child({});
   _$.write("</div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/entities/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/entities/__snapshots__/html.expected/template.js
index c263a33f39..66436545a4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/entities/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/entities/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("Hello John &amp; Suzy Invalid Entity: &b ; Valid Numeric Entity: &#34; Valid Hexadecimal Entity: &#x00A2;");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/error-const-mutation/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/error-const-mutation/__snapshots__/html.expected/template.js
index 06b3a4a1f2..006b3f3bcb 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/error-const-mutation/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/error-const-mutation/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const user = {
     firstName: "George",
@@ -8,5 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   };
   const fullName = user.fullName = `${user.firstName} ${user.middleName} ${user.lastName}`;
   _$.write(`<p>${_$.escapeXML(fullName)}</p>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-by/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/for-by/__snapshots__/html.expected/template.js
index 2e8e7f1861..e5ba520a7a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-by/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-by/__snapshots__/html.expected/template.js
@@ -11,7 +11,7 @@ function getMissingBy() {
 }
 _$.register(getMissingBy, "__tests__/template.marko_0/getMissingBy");
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const _scope2_ = new Map();
@@ -92,5 +92,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     items: "14:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-destructure/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/for-destructure/__snapshots__/html.expected/template.js
index 07cc0f90f1..aff4773f4e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-destructure/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-destructure/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const id = 0;
@@ -27,5 +27,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     items: "3:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/html.expected/template.js
index 1aed99abaf..099efaed74 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-event-handler/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const num = 0;
@@ -19,5 +19,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     num: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag-siblings/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/for-tag-siblings/__snapshots__/html.expected/template.js
index 35ebc7d30d..99b08aa70a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag-siblings/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag-siblings/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const arrA = [1, 2, 3];
   _$.write("<div>");
@@ -13,5 +13,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _$.write(`<div>${_$.escapeXML(val)}</div>`);
   });
   _$.write("<div></div></div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-node-only-child-in-parent/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-node-only-child-in-parent/__snapshots__/html.expected/template.js
index 10b773c257..08f9c4343e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-node-only-child-in-parent/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-node-only-child-in-parent/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const children = [1];
@@ -19,5 +19,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     children: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-text-node-with-text-before/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-text-node-with-text-before/__snapshots__/html.expected/template.js
index 84ed799a11..4ec161dfa6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-text-node-with-text-before/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag-single-text-node-with-text-before/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const children = [1];
@@ -19,5 +19,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     children: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/html.expected/template.js
index 83d8cc58ea..d76f2b5bb9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag-with-state/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope2_ = new Map();
   const arrA = [1, 2, 3];
@@ -18,5 +18,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     "#text/1(": _scope2_.size ? _scope2_ : undefined
   }, "__tests__/template.marko", 0);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/for-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/for-tag/__snapshots__/html.expected/template.js
index c6b05855d0..7e79680112 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/for-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/for-tag/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const arr = [1, 2, 3];
   const obj = {
@@ -47,5 +47,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     const _scope10_id = _$.nextScopeId();
     _$.write("Hello");
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hello-dynamic/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hello-dynamic/__snapshots__/html.expected/template.js
index e3a57f2df6..001f17ae33 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hello-dynamic/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hello-dynamic/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`Hello <!>${_$.escapeXML(input.name)}${_$.markResumeNode(_scope0_id, "#text/0")}! Hello <!>${_$.toString(input.name)}${_$.markResumeNode(_scope0_id, "#text/1")}! Hello <!>${_$.toString(input.missing)}${_$.markResumeNode(_scope0_id, "#text/2")}!`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/html.expected/tags/child.js
index c3590acaf7..21ad78c4aa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const el = _$.nodeRef();
   _$.write(`<div></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
@@ -8,5 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/child.marko_0/_return", _scope0_id);
   _$.writeScope(_scope0_id, {}, "__tests__/tags/child.marko", 0);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/html.expected/tags/thing.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/html.expected/tags/thing.js
index 1aaf95d755..d0c1533585 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/html.expected/tags/thing.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/html.expected/tags/thing.js
@@ -1,11 +1,10 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/thing.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", input.what, {});
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(input.what)
+    "#text/0(": _$.dynamicTagId(input.what)
   }, "__tests__/tags/thing.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/thing.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/html.expected/template.js
index 8317650d3c..1c2c225865 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/html.expected/template.js
@@ -1,13 +1,13 @@
 import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _thing from "./tags/thing.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _hoisted_setHtml = _$.hoist(_scope0_id, "__tests__/template.marko_0__hoisted_setHtml/hoist");
   const _what_content_subscribers = new Set();
   _thing({
     what: _$.attrTag({
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: _$.registerContent("__tests__/template.marko_1_renderer", () => {
         const _scope1_id = _$.nextScopeId();
         const _childScope = _$.peekNextScope();
         const setHtml = _child({});
@@ -16,7 +16,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
           "#childScope/0": _$.writeExistingScope(_childScope),
           setHtml
         }, "__tests__/template.marko", "3:4"));
-      }), "__tests__/template.marko_1_renderer", _scope0_id)
+      }, _scope0_id)
     })
   });
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0__hoisted_setHtml");
@@ -26,5 +26,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/template.marko", 0, {
     _hoisted_setHtml: "4:12"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/resume.expected.md
index 1a766f25a7..68e5348e67 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/resume.expected.md
@@ -11,7 +11,7 @@
     <!--M_*4 #div/0-->
     <!--M_]2 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={"1?":_.e=new Set},2:{"#text/0!":_.b={"#scopeOffset/1":5,"#childScope/0":_.c={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.c)},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b,4:_.c},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.c["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),(_.e).add(_.b),_.d),1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={"1?":_.e=new Set},2:{"#text/0!":_.b={"#scopeOffset/1":5,"#childScope/0":_.c={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.c)},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.c["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),(_.e).add(_.b),_.d),1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/ssr.expected.md
index e17ea060b9..93139812f0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-attr-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[3--><div></div><!--M_*4 #div/0--><!--M_]2 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={"1?":_.e=new Set},2:{"#text/0!":_.b={"#scopeOffset/1":5,"#childScope/0":_.c={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.c)},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b,4:_.c},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.c["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),(_.e).add(_.b),_.d),1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()</script>
+  <!--M_[3--><div></div><!--M_*4 #div/0--><!--M_]2 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={1:_.a={"1?":_.e=new Set},2:{"#text/0!":_.b={"#scopeOffset/1":5,"#childScope/0":_.c={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.c)},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.c["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),(_.e).add(_.b),_.d),1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()</script>
 ```
 
 # Render End
@@ -13,7 +13,7 @@
     <!--M_*4 #div/0-->
     <!--M_]2 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={"1?":_.e=new Set},2:{"#text/0!":_.b={"#scopeOffset/1":5,"#childScope/0":_.c={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.c)},"#text/0(":_._["__tests__/template.marko_1_renderer"](_.a)},3:_.b,4:_.c},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.c["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),(_.e).add(_.b),_.d),1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={1:_.a={"1?":_.e=new Set},2:{"#text/0!":_.b={"#scopeOffset/1":5,"#childScope/0":_.c={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.c)},"#text/0(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.c["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),(_.e).add(_.b),_.d),1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/dom.expected/template.hydrate.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/dom.expected/template.hydrate.js
index af9e048a35..02f3ca46aa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/dom.expected/template.hydrate.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/dom.expected/template.hydrate.js
@@ -1,4 +1,4 @@
-// size: 915 (min) 385 (brotli)
+// size: 821 (min) 391 (brotli)
 const _dynamicTag2 = _$.dynamicTag(1),
   _dynamicTag = _$.dynamicTag(),
   _input_content_ = _$.value(4, (_scope, input_content) => {
@@ -31,13 +31,14 @@ _$.registerContent(
 );
 const _get_hoisted_setHtml2 = _$.hoist(11, "3?", "2?"),
   _setHtml2$thing_content = _$.registerBoundSignal("c3", _$.value(11)),
-  _thing_content2 = _$.registerContent(
+  _setup$thing_content2 = (_scope) => {
+    _$.setTagVar(_scope, 0, _setHtml2$thing_content), _setup_(_scope[0]);
+  },
+  _thing_content2 = _$.createContent(
     "c2",
     "<div></div>",
     "0 b&",
-    (_scope) => {
-      _$.setTagVar(_scope, 0, _setHtml2$thing_content), _setup_(_scope[0]);
-    },
+    _setup$thing_content2,
     0,
     "3?",
   );
@@ -51,18 +52,8 @@ _$.registerContent(
   0,
   "2?",
 ),
-  _$.register("c6", _$.hoist(5, "1?"));
-const _setHtml$thing_content = _$.registerBoundSignal("c7", _$.value(5));
-_$.registerContent(
-  "c5",
-  "<div></div>",
-  "0 b&",
-  (_scope) => {
-    _$.setTagVar(_scope, 0, _setHtml$thing_content), _setup_(_scope[0]);
-  },
-  0,
-  "1?",
-),
+  _$.register("c6", _$.hoist(5, "1?")),
+  _$.registerBoundSignal("c7", _$.value(5)),
   _$.effect("c8", ({ 6: _hoisted_setHtml }) => {
     for (const fn of 6) fn("Hoist from custom tag");
   }),
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/dom.expected/template.js
index f984d7dee6..9adec8892f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/dom.expected/template.js
@@ -17,7 +17,7 @@ const _setup$thing_content2 = _scope => {
   _$.setTagVar(_scope, "#childScope/0", _setHtml2$thing_content);
   _child(_scope["#childScope/0"]);
 };
-const _thing_content2 = _$.registerContent("__tests__/template.marko_3_renderer", _child_template, /* beginChildWithVar, _child_walks, endChild */`0${_child_walks}&`, _setup$thing_content2, 0, "3?");
+const _thing_content2 = /* @__PURE__ */_$.createContent("__tests__/template.marko_3_renderer", _child_template, /* beginChildWithVar, _child_walks, endChild */`0${_child_walks}&`, _setup$thing_content2, 0, "3?");
 const _setup$inputShowThingNull_content = _scope => {
   _thing(_scope["#childScope/0"]);
   _thing_input_content(_scope["#childScope/0"], _thing_content2(_scope));
@@ -29,7 +29,7 @@ const _setup$thing_content = _scope => {
   _$.setTagVar(_scope, "#childScope/0", _setHtml$thing_content);
   _child(_scope["#childScope/0"]);
 };
-const _thing_content = _$.registerContent("__tests__/template.marko_1_renderer", _child_template, /* beginChildWithVar, _child_walks, endChild */`0${_child_walks}&`, _setup$thing_content, 0, "1?");
+const _thing_content = /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", _child_template, /* beginChildWithVar, _child_walks, endChild */`0${_child_walks}&`, _setup$thing_content, 0, "1?");
 const _dynamicTag2 = /* @__PURE__ */_$.dynamicTag("#text/2", _inputShowSectionNull_content);
 const _dynamicTag = /* @__PURE__ */_$.dynamicTag("#text/1", _inputShowThingNull_content);
 const _hoisted_setHtml_effect = _$.effect("__tests__/template.marko_0__hoisted_setHtml", ({
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/html.expected/tags/child.js
index c3590acaf7..21ad78c4aa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const el = _$.nodeRef();
   _$.write(`<div></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
@@ -8,5 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/child.marko_0/_return", _scope0_id);
   _$.writeScope(_scope0_id, {}, "__tests__/tags/child.marko", 0);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/html.expected/tags/thing.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/html.expected/tags/thing.js
index b1e2706fa4..1d5850e45b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/html.expected/tags/thing.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/html.expected/tags/thing.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/thing.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", input.content, {});
@@ -7,9 +7,8 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.dynamicTagInput(_scope0_id, "#text/1", input.content, {});
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(input.content),
+    "#text/0(": _$.dynamicTagId(input.content),
     "#text/1!": _$.writeExistingScope(_dynamicScope2),
-    "#text/1(": _$.normalizeDynamicRenderer(input.content)
+    "#text/1(": _$.dynamicTagId(input.content)
   }, "__tests__/tags/thing.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/thing.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/html.expected/template.js
index 26c6327d8a..6a3ce4a7ab 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/html.expected/template.js
@@ -2,14 +2,14 @@ import Thing from "./tags/thing.marko";
 import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _thing from "./tags/thing.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _hoisted_setHtml = _$.hoist(_scope0_id, "__tests__/template.marko_0__hoisted_setHtml/hoist");
   const _thing_content_subscribers = new Set();
   const _inputShowThingNull_content_subscribers = new Set();
   const _inputShowSectionNull_content_subscribers = new Set();
   _thing({
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       const _childScope = _$.peekNextScope();
       const setHtml = _child({});
@@ -18,14 +18,14 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
         "#childScope/0": _$.writeExistingScope(_childScope),
         setHtml
       }, "__tests__/template.marko", "3:2"));
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   });
   const _dynamicScope = _$.peekNextScope();
-  _$.dynamicTagInput(_scope0_id, "#text/1", input.show ? Thing : null, {}, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  _$.dynamicTagInput(_scope0_id, "#text/1", input.show ? Thing : null, {}, _$.registerContent("__tests__/template.marko_2_renderer", () => {
     const _scope2_id = _$.nextScopeId();
     const _thing_content2_subscribers = new Set();
     _thing({
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: /* @__PURE__ */_$.createContent("__tests__/template.marko_3_renderer", () => {
         const _scope3_id = _$.nextScopeId();
         const _childScope2 = _$.peekNextScope();
         const setHtml2 = _child({});
@@ -34,14 +34,14 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
           "#childScope/0": _$.writeExistingScope(_childScope2),
           setHtml2
         }, "__tests__/template.marko", "16:4"));
-      }), "__tests__/template.marko_3_renderer", _scope2_id)
+      })
     });
     _$.writeSubscribe(_inputShowThingNull_content_subscribers, _$.writeScope(_scope2_id, {
       "3?": _thing_content2_subscribers
     }, "__tests__/template.marko", "15:4"));
-  }), "__tests__/template.marko_2_renderer", _scope0_id));
+  }, _scope0_id));
   const _dynamicScope2 = _$.peekNextScope();
-  _$.dynamicTagInput(_scope0_id, "#text/2", input.show ? 'section' : null, {}, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  _$.dynamicTagInput(_scope0_id, "#text/2", input.show ? 'section' : null, {}, _$.registerContent("__tests__/template.marko_4_renderer", () => {
     const _scope4_id = _$.nextScopeId();
     const _childScope3 = _$.peekNextScope();
     const setHtml3 = _child({});
@@ -50,7 +50,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
       "#childScope/0": _$.writeExistingScope(_childScope3),
       setHtml3
     }, "__tests__/template.marko", "26:4"));
-  }), "__tests__/template.marko_4_renderer", _scope0_id));
+  }, _scope0_id));
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0__hoisted_setHtml");
   _$.writeScope(_scope0_id, {
@@ -58,12 +58,11 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     "1?": _thing_content_subscribers,
     "2?": _inputShowThingNull_content_subscribers,
     "#text/1!": _$.writeExistingScope(_dynamicScope),
-    "#text/1(": _$.normalizeDynamicRenderer(input.show ? Thing : null),
+    "#text/1(": _$.dynamicTagId(input.show ? Thing : null),
     "4?": _inputShowSectionNull_content_subscribers,
     "#text/2!": _$.writeExistingScope(_dynamicScope2),
-    "#text/2(": _$.normalizeDynamicRenderer(input.show ? 'section' : null)
+    "#text/2(": _$.dynamicTagId(input.show ? 'section' : null)
   }, "__tests__/template.marko", 0, {
     _hoisted_setHtml: "4:10"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/resume.expected.md
index 89f183df06..06019841ed 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/resume.expected.md
@@ -48,7 +48,7 @@
     </section>
     <!--M_|1 #text/2 26-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.w={1:_.a={"1?":_.x=new Set,"2?":_.z=new Set,"#text/1!":_.b={"#text/0!":_.h={"3?":_.y=new Set},"#text/1!":_.n={"3?":_.A=new Set}},"#text/1(":_._["__tests__/tags/thing.marko"],"4?":_.B=new Set,"#text/2!":_.t={},"#text/2(":"section"},2:{"#text/0!":_.c={"#scopeOffset/1":5,"#childScope/0":_.d={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.d)},"#text/0(":_.g=_._["__tests__/template.marko_1_renderer"](_.a),"#text/1!":_.e={"#scopeOffset/1":8,"#childScope/0":_.f={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.f)},"#text/1(":_.g},3:_.c,4:_.d,6:_.e,7:_.f,9:_.b,10:_.h,11:{"#text/0!":_.i={"#scopeOffset/1":14,"#childScope/0":_.j={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.j)},"#text/0(":_.m=_._["__tests__/template.marko_3_renderer"](_.h),"#text/1!":_.k={"#scopeOffset/1":17,"#childScope/0":_.l={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.l)},"#text/1(":_.m},12:_.i,13:_.j,15:_.k,16:_.l,18:_.n,19:{"#text/0!":_.o={"#scopeOffset/1":22,"#childScope/0":_.p={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.p)},"#text/0(":_.s=_._["__tests__/template.marko_3_renderer"](_.n),"#text/1!":_.q={"#scopeOffset/1":25,"#childScope/0":_.r={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.r)},"#text/1(":_.s},20:_.o,21:_.p,23:_.q,24:_.r,26:_.t,27:_.u={"#scopeOffset/1":29,"#childScope/0":_.v={},setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.v)},28:_.v},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.b["#text/0("]=_.b["#text/1("]=_._["__tests__/template.marko_2_renderer"](_.a),_.d["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.f["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.j["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.i),_.l["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.k),_.p["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.o),_.r["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.q),_.v["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.u),(_.x).add(_.c),(_.x).add(_.e),(_.y).add(_.i),(_.y).add(_.k),(_.z).add(_.h),(_.A).add(_.o),(_.A).add(_.q),(_.z).add(_.n),(_.B).add(_.u),_.w),1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.t={1:_.a={"1?":_.u=new Set,"2?":_.w=new Set,"#text/1!":_.f={"#text/0!":_.g={"3?":_.v=new Set},"#text/0(":"__tests__/template.marko_2_renderer","#text/1!":_.l={"3?":_.x=new Set},"#text/1(":"__tests__/template.marko_2_renderer"},"#text/1(":"__tests__/tags/thing.marko","4?":_.y=new Set,"#text/2!":_.q={},"#text/2(":"section"},2:{"#text/0!":_.b={"#scopeOffset/1":5,"#childScope/0":_.c={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.c)},"#text/0(":"__tests__/template.marko_1_renderer","#text/1!":_.d={"#scopeOffset/1":8,"#childScope/0":_.e={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.e)},"#text/1(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c,6:_.d,7:_.e,9:_.f,10:_.g,11:{"#text/0!":_.h={"#scopeOffset/1":14,"#childScope/0":_.i={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.i)},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.j={"#scopeOffset/1":17,"#childScope/0":_.k={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.k)},"#text/1(":"__tests__/template.marko_3_renderer"},12:_.h,13:_.i,15:_.j,16:_.k,18:_.l,19:{"#text/0!":_.m={"#scopeOffset/1":22,"#childScope/0":_.n={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.n)},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.o={"#scopeOffset/1":25,"#childScope/0":_.p={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.p)},"#text/1(":"__tests__/template.marko_3_renderer"},20:_.m,21:_.n,23:_.o,24:_.p,26:_.q,27:_.r={"#scopeOffset/1":29,"#childScope/0":_.s={},setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.s)},28:_.s},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.c["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),_.e["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.d),_.i["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.h),_.k["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.j),_.n["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.m),_.p["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.o),_.s["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.r),(_.u).add(_.b),(_.u).add(_.d),(_.v).add(_.h),(_.v).add(_.j),(_.w).add(_.g),(_.x).add(_.m),(_.x).add(_.o),(_.w).add(_.l),(_.y).add(_.r),_.t),1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/ssr.expected.md
index b607c97469..88c455e100 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-from-dynamic/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[3--><div></div><!--M_*4 #div/0--><!--M_]2 #text/0--><!--M_[6--><div></div><!--M_*7 #div/0--><!--M_]2 #text/1--><!--M_[9--><!--M_[10--><!--M_[12--><div></div><!--M_*13 #div/0--><!--M_]11 #text/0--><!--M_[15--><div></div><!--M_*16 #div/0--><!--M_]11 #text/1--><!--M_]9 #text/0--><!--M_[18--><!--M_[20--><div></div><!--M_*21 #div/0--><!--M_]19 #text/0--><!--M_[23--><div></div><!--M_*24 #div/0--><!--M_]19 #text/1--><!--M_]9 #text/1--><!--M_]1 #text/1--><section><div></div><!--M_*28 #div/0--></section><!--M_|1 #text/2 26--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.w={1:_.a={"1?":_.x=new Set,"2?":_.z=new Set,"#text/1!":_.b={"#text/0!":_.h={"3?":_.y=new Set},"#text/1!":_.n={"3?":_.A=new Set}},"#text/1(":_._["__tests__/tags/thing.marko"],"4?":_.B=new Set,"#text/2!":_.t={},"#text/2(":"section"},2:{"#text/0!":_.c={"#scopeOffset/1":5,"#childScope/0":_.d={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.d)},"#text/0(":_.g=_._["__tests__/template.marko_1_renderer"](_.a),"#text/1!":_.e={"#scopeOffset/1":8,"#childScope/0":_.f={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.f)},"#text/1(":_.g},3:_.c,4:_.d,6:_.e,7:_.f,9:_.b,10:_.h,11:{"#text/0!":_.i={"#scopeOffset/1":14,"#childScope/0":_.j={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.j)},"#text/0(":_.m=_._["__tests__/template.marko_3_renderer"](_.h),"#text/1!":_.k={"#scopeOffset/1":17,"#childScope/0":_.l={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.l)},"#text/1(":_.m},12:_.i,13:_.j,15:_.k,16:_.l,18:_.n,19:{"#text/0!":_.o={"#scopeOffset/1":22,"#childScope/0":_.p={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.p)},"#text/0(":_.s=_._["__tests__/template.marko_3_renderer"](_.n),"#text/1!":_.q={"#scopeOffset/1":25,"#childScope/0":_.r={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.r)},"#text/1(":_.s},20:_.o,21:_.p,23:_.q,24:_.r,26:_.t,27:_.u={"#scopeOffset/1":29,"#childScope/0":_.v={},setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.v)},28:_.v},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.b["#text/0("]=_.b["#text/1("]=_._["__tests__/template.marko_2_renderer"](_.a),_.d["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.f["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.j["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.i),_.l["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.k),_.p["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.o),_.r["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.q),_.v["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.u),(_.x).add(_.c),(_.x).add(_.e),(_.y).add(_.i),(_.y).add(_.k),(_.z).add(_.h),(_.A).add(_.o),(_.A).add(_.q),(_.z).add(_.n),(_.B).add(_.u),_.w),1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()</script>
+  <!--M_[3--><div></div><!--M_*4 #div/0--><!--M_]2 #text/0--><!--M_[6--><div></div><!--M_*7 #div/0--><!--M_]2 #text/1--><!--M_[9--><!--M_[10--><!--M_[12--><div></div><!--M_*13 #div/0--><!--M_]11 #text/0--><!--M_[15--><div></div><!--M_*16 #div/0--><!--M_]11 #text/1--><!--M_]9 #text/0--><!--M_[18--><!--M_[20--><div></div><!--M_*21 #div/0--><!--M_]19 #text/0--><!--M_[23--><div></div><!--M_*24 #div/0--><!--M_]19 #text/1--><!--M_]9 #text/1--><!--M_]1 #text/1--><section><div></div><!--M_*28 #div/0--></section><!--M_|1 #text/2 26--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.t={1:_.a={"1?":_.u=new Set,"2?":_.w=new Set,"#text/1!":_.f={"#text/0!":_.g={"3?":_.v=new Set},"#text/0(":"__tests__/template.marko_2_renderer","#text/1!":_.l={"3?":_.x=new Set},"#text/1(":"__tests__/template.marko_2_renderer"},"#text/1(":"__tests__/tags/thing.marko","4?":_.y=new Set,"#text/2!":_.q={},"#text/2(":"section"},2:{"#text/0!":_.b={"#scopeOffset/1":5,"#childScope/0":_.c={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.c)},"#text/0(":"__tests__/template.marko_1_renderer","#text/1!":_.d={"#scopeOffset/1":8,"#childScope/0":_.e={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.e)},"#text/1(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c,6:_.d,7:_.e,9:_.f,10:_.g,11:{"#text/0!":_.h={"#scopeOffset/1":14,"#childScope/0":_.i={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.i)},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.j={"#scopeOffset/1":17,"#childScope/0":_.k={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.k)},"#text/1(":"__tests__/template.marko_3_renderer"},12:_.h,13:_.i,15:_.j,16:_.k,18:_.l,19:{"#text/0!":_.m={"#scopeOffset/1":22,"#childScope/0":_.n={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.n)},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.o={"#scopeOffset/1":25,"#childScope/0":_.p={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.p)},"#text/1(":"__tests__/template.marko_3_renderer"},20:_.m,21:_.n,23:_.o,24:_.p,26:_.q,27:_.r={"#scopeOffset/1":29,"#childScope/0":_.s={},setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.s)},28:_.s},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.c["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),_.e["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.d),_.i["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.h),_.k["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.j),_.n["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.m),_.p["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.o),_.s["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.r),(_.u).add(_.b),(_.u).add(_.d),(_.v).add(_.h),(_.v).add(_.j),(_.w).add(_.g),(_.x).add(_.m),(_.x).add(_.o),(_.w).add(_.l),(_.y).add(_.r),_.t),1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()</script>
 ```
 
 # Render End
@@ -44,7 +44,7 @@
     </section>
     <!--M_|1 #text/2 26-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.w={1:_.a={"1?":_.x=new Set,"2?":_.z=new Set,"#text/1!":_.b={"#text/0!":_.h={"3?":_.y=new Set},"#text/1!":_.n={"3?":_.A=new Set}},"#text/1(":_._["__tests__/tags/thing.marko"],"4?":_.B=new Set,"#text/2!":_.t={},"#text/2(":"section"},2:{"#text/0!":_.c={"#scopeOffset/1":5,"#childScope/0":_.d={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.d)},"#text/0(":_.g=_._["__tests__/template.marko_1_renderer"](_.a),"#text/1!":_.e={"#scopeOffset/1":8,"#childScope/0":_.f={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.f)},"#text/1(":_.g},3:_.c,4:_.d,6:_.e,7:_.f,9:_.b,10:_.h,11:{"#text/0!":_.i={"#scopeOffset/1":14,"#childScope/0":_.j={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.j)},"#text/0(":_.m=_._["__tests__/template.marko_3_renderer"](_.h),"#text/1!":_.k={"#scopeOffset/1":17,"#childScope/0":_.l={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.l)},"#text/1(":_.m},12:_.i,13:_.j,15:_.k,16:_.l,18:_.n,19:{"#text/0!":_.o={"#scopeOffset/1":22,"#childScope/0":_.p={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.p)},"#text/0(":_.s=_._["__tests__/template.marko_3_renderer"](_.n),"#text/1!":_.q={"#scopeOffset/1":25,"#childScope/0":_.r={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.r)},"#text/1(":_.s},20:_.o,21:_.p,23:_.q,24:_.r,26:_.t,27:_.u={"#scopeOffset/1":29,"#childScope/0":_.v={},setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.v)},28:_.v},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.b["#text/0("]=_.b["#text/1("]=_._["__tests__/template.marko_2_renderer"](_.a),_.d["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.f["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.j["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.i),_.l["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.k),_.p["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.o),_.r["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.q),_.v["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.u),(_.x).add(_.c),(_.x).add(_.e),(_.y).add(_.i),(_.y).add(_.k),(_.z).add(_.h),(_.A).add(_.o),(_.A).add(_.q),(_.z).add(_.n),(_.B).add(_.u),_.w),1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.t={1:_.a={"1?":_.u=new Set,"2?":_.w=new Set,"#text/1!":_.f={"#text/0!":_.g={"3?":_.v=new Set},"#text/0(":"__tests__/template.marko_2_renderer","#text/1!":_.l={"3?":_.x=new Set},"#text/1(":"__tests__/template.marko_2_renderer"},"#text/1(":"__tests__/tags/thing.marko","4?":_.y=new Set,"#text/2!":_.q={},"#text/2(":"section"},2:{"#text/0!":_.b={"#scopeOffset/1":5,"#childScope/0":_.c={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.c)},"#text/0(":"__tests__/template.marko_1_renderer","#text/1!":_.d={"#scopeOffset/1":8,"#childScope/0":_.e={},setHtml:_._["__tests__/tags/child.marko_0/_return"](_.e)},"#text/1(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c,6:_.d,7:_.e,9:_.f,10:_.g,11:{"#text/0!":_.h={"#scopeOffset/1":14,"#childScope/0":_.i={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.i)},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.j={"#scopeOffset/1":17,"#childScope/0":_.k={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.k)},"#text/1(":"__tests__/template.marko_3_renderer"},12:_.h,13:_.i,15:_.j,16:_.k,18:_.l,19:{"#text/0!":_.m={"#scopeOffset/1":22,"#childScope/0":_.n={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.n)},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.o={"#scopeOffset/1":25,"#childScope/0":_.p={},setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.p)},"#text/1(":"__tests__/template.marko_3_renderer"},20:_.m,21:_.n,23:_.o,24:_.p,26:_.q,27:_.r={"#scopeOffset/1":29,"#childScope/0":_.s={},setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.s)},28:_.s},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.c["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),_.e["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.d),_.i["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.h),_.k["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.j),_.n["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.m),_.p["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.o),_.s["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.r),(_.u).add(_.b),(_.u).add(_.d),(_.v).add(_.h),(_.v).add(_.j),(_.w).add(_.g),(_.x).add(_.m),(_.x).add(_.o),(_.w).add(_.l),(_.y).add(_.r),_.t),1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/html.expected/tags/child.js
index c3590acaf7..21ad78c4aa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const el = _$.nodeRef();
   _$.write(`<div></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
@@ -8,5 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/child.marko_0/_return", _scope0_id);
   _$.writeScope(_scope0_id, {}, "__tests__/tags/child.marko", 0);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/html.expected/template.js
index 503b675fa4..d57f639d3b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var-many/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const _scope2_ = new Map();
@@ -63,5 +63,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _hoisted_setHtml3: "25:12"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/html.expected/tags/child.js
index c3590acaf7..21ad78c4aa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const el = _$.nodeRef();
   _$.write(`<div></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
@@ -8,5 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/child.marko_0/_return", _scope0_id);
   _$.writeScope(_scope0_id, {}, "__tests__/tags/child.marko", 0);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/html.expected/tags/thing.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/html.expected/tags/thing.js
index a04a03fb69..bbfa4911e4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/html.expected/tags/thing.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/html.expected/tags/thing.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/thing.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.writeEffect(_scope0_id, "__tests__/tags/thing.marko_0_input_value");
   _$.writeScope(_scope0_id, {
@@ -7,5 +7,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/thing.marko", 0, {
     input_value: ["input.value"]
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/thing.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/html.expected/template.js
index bc60d8bf96..c982db9dcb 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-custom-tag-var/__snapshots__/html.expected/template.js
@@ -1,7 +1,7 @@
 import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _thing from "./tags/thing.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _hoisted_setHtml = _$.hoist(_scope0_id, "__tests__/template.marko_0__hoisted_setHtml/hoist");
   let _ifScopeId2, _ifBranch2;
@@ -81,5 +81,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/template.marko", 0, {
     input_show: ["input.show"]
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/dom.expected/template.hydrate.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/dom.expected/template.hydrate.js
index 008171d946..07e485f806 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/dom.expected/template.hydrate.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/dom.expected/template.hydrate.js
@@ -1,4 +1,4 @@
-// size: 973 (min) 383 (brotli)
+// size: 874 (min) 383 (brotli)
 function _setup_$1(_scope) {
   _$.tagVarSignal(_scope, _return(_scope));
 }
@@ -41,13 +41,14 @@ const _get_hoisted_setHtml2 = _$.hoist(11, "3?", "2?"),
     () => _setHtml2$thing_content,
   ),
   _setHtml2$thing_content = _$.registerBoundSignal("c3", _$.value(11)),
-  _thing_content2 = _$.registerContent(
+  _setup$thing_content2 = (_scope) => {
+    _dynamicTag$thing_content2(_scope, Child);
+  },
+  _thing_content2 = _$.createContent(
     "c2",
     "<!><!><!>",
     "D1D",
-    (_scope) => {
-      _dynamicTag$thing_content2(_scope, Child);
-    },
+    _setup$thing_content2,
     0,
     "3?",
   );
@@ -61,23 +62,8 @@ _$.registerContent(
   0,
   "2?",
 ),
-  _$.register("c6", _$.hoist(5, "1?"));
-const _dynamicTag$thing_content = _$.dynamicTag(
-    0,
-    0,
-    () => _setHtml$thing_content,
-  ),
-  _setHtml$thing_content = _$.registerBoundSignal("c7", _$.value(5));
-_$.registerContent(
-  "c5",
-  "<!><!><!>",
-  "D1D",
-  (_scope) => {
-    _dynamicTag$thing_content(_scope, Child);
-  },
-  0,
-  "1?",
-),
+  _$.register("c6", _$.hoist(5, "1?")),
+  _$.registerBoundSignal("c7", _$.value(5)),
   _$.effect("c8", ({ 6: _hoisted_setHtml }) => {
     for (const fn of 6) fn("Hoist from custom tag");
   }),
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/dom.expected/template.js
index c098682b81..c796eb9736 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/dom.expected/template.js
@@ -17,7 +17,7 @@ const _setHtml2$thing_content = _$.registerBoundSignal("__tests__/template.marko
 const _setup$thing_content2 = _scope => {
   _dynamicTag$thing_content2(_scope, 1 && Child);
 };
-const _thing_content2 = _$.registerContent("__tests__/template.marko_3_renderer", "<!><!><!>", /* dynamicTagWithVar */"D1D", _setup$thing_content2, 0, "3?");
+const _thing_content2 = /* @__PURE__ */_$.createContent("__tests__/template.marko_3_renderer", "<!><!><!>", /* dynamicTagWithVar */"D1D", _setup$thing_content2, 0, "3?");
 const _setup$inputShowThingNull_content = _scope => {
   _thing(_scope["#childScope/0"]);
   _thing_input_content(_scope["#childScope/0"], _thing_content2(_scope));
@@ -29,7 +29,7 @@ const _setHtml$thing_content = _$.registerBoundSignal("__tests__/template.marko_
 const _setup$thing_content = _scope => {
   _dynamicTag$thing_content(_scope, 1 && Child);
 };
-const _thing_content = _$.registerContent("__tests__/template.marko_1_renderer", "<!><!><!>", /* dynamicTagWithVar */"D1D", _setup$thing_content, 0, "1?");
+const _thing_content = /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", "<!><!><!>", /* dynamicTagWithVar */"D1D", _setup$thing_content, 0, "1?");
 const _dynamicTag2 = /* @__PURE__ */_$.dynamicTag("#text/2", _inputShowSectionNull_content);
 const _dynamicTag = /* @__PURE__ */_$.dynamicTag("#text/1", _inputShowThingNull_content);
 const _hoisted_setHtml_effect = _$.effect("__tests__/template.marko_0__hoisted_setHtml", ({
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/html.expected/tags/child.js
index c3590acaf7..21ad78c4aa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const el = _$.nodeRef();
   _$.write(`<div></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
@@ -8,5 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/child.marko_0/_return", _scope0_id);
   _$.writeScope(_scope0_id, {}, "__tests__/tags/child.marko", 0);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/html.expected/tags/thing.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/html.expected/tags/thing.js
index b1e2706fa4..1d5850e45b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/html.expected/tags/thing.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/html.expected/tags/thing.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/thing.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", input.content, {});
@@ -7,9 +7,8 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.dynamicTagInput(_scope0_id, "#text/1", input.content, {});
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(input.content),
+    "#text/0(": _$.dynamicTagId(input.content),
     "#text/1!": _$.writeExistingScope(_dynamicScope2),
-    "#text/1(": _$.normalizeDynamicRenderer(input.content)
+    "#text/1(": _$.dynamicTagId(input.content)
   }, "__tests__/tags/thing.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/thing.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/html.expected/template.js
index a3681a5d34..11adf687ad 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/html.expected/template.js
@@ -2,58 +2,58 @@ import Child from "./tags/child.marko";
 import Thing from "./tags/thing.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _thing from "./tags/thing.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _hoisted_setHtml = _$.hoist(_scope0_id, "__tests__/template.marko_0__hoisted_setHtml/hoist");
   const _thing_content_subscribers = new Set();
   const _inputShowThingNull_content_subscribers = new Set();
   const _inputShowSectionNull_content_subscribers = new Set();
   _thing({
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       const _dynamicScope = _$.peekNextScope();
       const setHtml = _$.dynamicTagInput(_scope1_id, "#text/0", 1 && Child, {}, void 0);
       _$.setTagVar(_scope1_id, "#scopeOffset/1", _dynamicScope, "__tests__/template.marko_1_setHtml/var");
       _$.writeSubscribe(_thing_content_subscribers, _$.writeScope(_scope1_id, {
         "#text/0!": _$.writeExistingScope(_dynamicScope),
-        "#text/0(": _$.normalizeDynamicRenderer(1 && Child),
+        "#text/0(": _$.dynamicTagId(1 && Child),
         setHtml
       }, "__tests__/template.marko", "4:2"));
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   });
   const _dynamicScope3 = _$.peekNextScope();
-  _$.dynamicTagInput(_scope0_id, "#text/1", input.show ? Thing : null, {}, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  _$.dynamicTagInput(_scope0_id, "#text/1", input.show ? Thing : null, {}, _$.registerContent("__tests__/template.marko_2_renderer", () => {
     const _scope2_id = _$.nextScopeId();
     const _thing_content2_subscribers = new Set();
     _thing({
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: /* @__PURE__ */_$.createContent("__tests__/template.marko_3_renderer", () => {
         const _scope3_id = _$.nextScopeId();
         const _dynamicScope2 = _$.peekNextScope();
         const setHtml2 = _$.dynamicTagInput(_scope3_id, "#text/0", 1 && Child, {}, void 0);
         _$.setTagVar(_scope3_id, "#scopeOffset/1", _dynamicScope2, "__tests__/template.marko_3_setHtml2/var");
         _$.writeSubscribe(_thing_content2_subscribers, _$.writeScope(_scope3_id, {
           "#text/0!": _$.writeExistingScope(_dynamicScope2),
-          "#text/0(": _$.normalizeDynamicRenderer(1 && Child),
+          "#text/0(": _$.dynamicTagId(1 && Child),
           setHtml2
         }, "__tests__/template.marko", "17:4"));
-      }), "__tests__/template.marko_3_renderer", _scope2_id)
+      })
     });
     _$.writeSubscribe(_inputShowThingNull_content_subscribers, _$.writeScope(_scope2_id, {
       "3?": _thing_content2_subscribers
     }, "__tests__/template.marko", "16:4"));
-  }), "__tests__/template.marko_2_renderer", _scope0_id));
+  }, _scope0_id));
   const _dynamicScope5 = _$.peekNextScope();
-  _$.dynamicTagInput(_scope0_id, "#text/2", input.show ? 'section' : null, {}, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  _$.dynamicTagInput(_scope0_id, "#text/2", input.show ? 'section' : null, {}, _$.registerContent("__tests__/template.marko_4_renderer", () => {
     const _scope4_id = _$.nextScopeId();
     const _dynamicScope4 = _$.peekNextScope();
     const setHtml3 = _$.dynamicTagInput(_scope4_id, "#text/0", 1 && Child, {}, void 0);
     _$.setTagVar(_scope4_id, "#scopeOffset/1", _dynamicScope4, "__tests__/template.marko_4_setHtml3/var");
     _$.writeSubscribe(_inputShowSectionNull_content_subscribers, _$.writeScope(_scope4_id, {
       "#text/0!": _$.writeExistingScope(_dynamicScope4),
-      "#text/0(": _$.normalizeDynamicRenderer(1 && Child),
+      "#text/0(": _$.dynamicTagId(1 && Child),
       setHtml3
     }, "__tests__/template.marko", "27:4"));
-  }), "__tests__/template.marko_4_renderer", _scope0_id));
+  }, _scope0_id));
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0__hoisted_setHtml");
   _$.writeScope(_scope0_id, {
@@ -61,12 +61,11 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     "1?": _thing_content_subscribers,
     "2?": _inputShowThingNull_content_subscribers,
     "#text/1!": _$.writeExistingScope(_dynamicScope3),
-    "#text/1(": _$.normalizeDynamicRenderer(input.show ? Thing : null),
+    "#text/1(": _$.dynamicTagId(input.show ? Thing : null),
     "4?": _inputShowSectionNull_content_subscribers,
     "#text/2!": _$.writeExistingScope(_dynamicScope5),
-    "#text/2(": _$.normalizeDynamicRenderer(input.show ? 'section' : null)
+    "#text/2(": _$.dynamicTagId(input.show ? 'section' : null)
   }, "__tests__/template.marko", 0, {
     _hoisted_setHtml: "5:18"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/resume.expected.md
index 75aa656e84..893cb2cb2d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/resume.expected.md
@@ -62,7 +62,7 @@
     </section>
     <!--M_|1 #text/2 26-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.w={1:_.a={"1?":_.x=new Set,"2?":_.z=new Set,"#text/1!":_.b={"#text/0!":_.h={"3?":_.y=new Set},"#text/1!":_.n={"3?":_.A=new Set}},"#text/1(":_._["__tests__/tags/thing.marko"],"4?":_.B=new Set,"#text/2!":_.t={},"#text/2(":"section"},2:{"#text/0!":_.c={"#scopeOffset/1":5,"#text/0!":_.d={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.d)},"#text/0(":_.g=_._["__tests__/template.marko_1_renderer"](_.a),"#text/1!":_.e={"#scopeOffset/1":8,"#text/0!":_.f={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.f)},"#text/1(":_.g},3:_.c,4:_.d,6:_.e,7:_.f,9:_.b,10:_.h,11:{"#text/0!":_.i={"#scopeOffset/1":14,"#text/0!":_.j={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.j)},"#text/0(":_.m=_._["__tests__/template.marko_3_renderer"](_.h),"#text/1!":_.k={"#scopeOffset/1":17,"#text/0!":_.l={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.l)},"#text/1(":_.m},12:_.i,13:_.j,15:_.k,16:_.l,18:_.n,19:{"#text/0!":_.o={"#scopeOffset/1":22,"#text/0!":_.p={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.p)},"#text/0(":_.s=_._["__tests__/template.marko_3_renderer"](_.n),"#text/1!":_.q={"#scopeOffset/1":25,"#text/0!":_.r={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.r)},"#text/1(":_.s},20:_.o,21:_.p,23:_.q,24:_.r,26:_.t,27:_.u={"#scopeOffset/1":29,"#text/0!":_.v={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.v)},28:_.v},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.b["#text/0("]=_.b["#text/1("]=_._["__tests__/template.marko_2_renderer"](_.a),_.d["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.f["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.j["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.i),_.l["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.k),_.p["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.o),_.r["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.q),_.v["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.u),(_.x).add(_.c),(_.x).add(_.e),(_.y).add(_.i),(_.y).add(_.k),(_.z).add(_.h),(_.A).add(_.o),(_.A).add(_.q),(_.z).add(_.n),(_.B).add(_.u),_.w),1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.t={1:_.a={"1?":_.u=new Set,"2?":_.w=new Set,"#text/1!":_.f={"#text/0!":_.g={"3?":_.v=new Set},"#text/0(":"__tests__/template.marko_2_renderer","#text/1!":_.l={"3?":_.x=new Set},"#text/1(":"__tests__/template.marko_2_renderer"},"#text/1(":"__tests__/tags/thing.marko","4?":_.y=new Set,"#text/2!":_.q={},"#text/2(":"section"},2:{"#text/0!":_.b={"#scopeOffset/1":5,"#text/0!":_.c={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.c)},"#text/0(":"__tests__/template.marko_1_renderer","#text/1!":_.d={"#scopeOffset/1":8,"#text/0!":_.e={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.e)},"#text/1(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c,6:_.d,7:_.e,9:_.f,10:_.g,11:{"#text/0!":_.h={"#scopeOffset/1":14,"#text/0!":_.i={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.i)},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.j={"#scopeOffset/1":17,"#text/0!":_.k={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.k)},"#text/1(":"__tests__/template.marko_3_renderer"},12:_.h,13:_.i,15:_.j,16:_.k,18:_.l,19:{"#text/0!":_.m={"#scopeOffset/1":22,"#text/0!":_.n={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.n)},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.o={"#scopeOffset/1":25,"#text/0!":_.p={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.p)},"#text/1(":"__tests__/template.marko_3_renderer"},20:_.m,21:_.n,23:_.o,24:_.p,26:_.q,27:_.r={"#scopeOffset/1":29,"#text/0!":_.s={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.s)},28:_.s},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.c["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),_.e["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.d),_.i["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.h),_.k["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.j),_.n["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.m),_.p["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.o),_.s["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.r),(_.u).add(_.b),(_.u).add(_.d),(_.v).add(_.h),(_.v).add(_.j),(_.w).add(_.g),(_.x).add(_.m),(_.x).add(_.o),(_.w).add(_.l),(_.y).add(_.r),_.t),1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/ssr.expected.md
index b804815d46..9642eda263 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-from-dynamic/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[3--><!--M_[4--><div></div><!--M_*4 #div/0--><!--M_]3 #text/0--><!--M_]2 #text/0--><!--M_[6--><!--M_[7--><div></div><!--M_*7 #div/0--><!--M_]6 #text/0--><!--M_]2 #text/1--><!--M_[9--><!--M_[10--><!--M_[12--><!--M_[13--><div></div><!--M_*13 #div/0--><!--M_]12 #text/0--><!--M_]11 #text/0--><!--M_[15--><!--M_[16--><div></div><!--M_*16 #div/0--><!--M_]15 #text/0--><!--M_]11 #text/1--><!--M_]9 #text/0--><!--M_[18--><!--M_[20--><!--M_[21--><div></div><!--M_*21 #div/0--><!--M_]20 #text/0--><!--M_]19 #text/0--><!--M_[23--><!--M_[24--><div></div><!--M_*24 #div/0--><!--M_]23 #text/0--><!--M_]19 #text/1--><!--M_]9 #text/1--><!--M_]1 #text/1--><section><!--M_[28--><div></div><!--M_*28 #div/0--><!--M_]27 #text/0--></section><!--M_|1 #text/2 26--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.w={1:_.a={"1?":_.x=new Set,"2?":_.z=new Set,"#text/1!":_.b={"#text/0!":_.h={"3?":_.y=new Set},"#text/1!":_.n={"3?":_.A=new Set}},"#text/1(":_._["__tests__/tags/thing.marko"],"4?":_.B=new Set,"#text/2!":_.t={},"#text/2(":"section"},2:{"#text/0!":_.c={"#scopeOffset/1":5,"#text/0!":_.d={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.d)},"#text/0(":_.g=_._["__tests__/template.marko_1_renderer"](_.a),"#text/1!":_.e={"#scopeOffset/1":8,"#text/0!":_.f={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.f)},"#text/1(":_.g},3:_.c,4:_.d,6:_.e,7:_.f,9:_.b,10:_.h,11:{"#text/0!":_.i={"#scopeOffset/1":14,"#text/0!":_.j={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.j)},"#text/0(":_.m=_._["__tests__/template.marko_3_renderer"](_.h),"#text/1!":_.k={"#scopeOffset/1":17,"#text/0!":_.l={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.l)},"#text/1(":_.m},12:_.i,13:_.j,15:_.k,16:_.l,18:_.n,19:{"#text/0!":_.o={"#scopeOffset/1":22,"#text/0!":_.p={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.p)},"#text/0(":_.s=_._["__tests__/template.marko_3_renderer"](_.n),"#text/1!":_.q={"#scopeOffset/1":25,"#text/0!":_.r={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.r)},"#text/1(":_.s},20:_.o,21:_.p,23:_.q,24:_.r,26:_.t,27:_.u={"#scopeOffset/1":29,"#text/0!":_.v={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.v)},28:_.v},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.b["#text/0("]=_.b["#text/1("]=_._["__tests__/template.marko_2_renderer"](_.a),_.d["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.f["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.j["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.i),_.l["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.k),_.p["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.o),_.r["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.q),_.v["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.u),(_.x).add(_.c),(_.x).add(_.e),(_.y).add(_.i),(_.y).add(_.k),(_.z).add(_.h),(_.A).add(_.o),(_.A).add(_.q),(_.z).add(_.n),(_.B).add(_.u),_.w),1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()</script>
+  <!--M_[3--><!--M_[4--><div></div><!--M_*4 #div/0--><!--M_]3 #text/0--><!--M_]2 #text/0--><!--M_[6--><!--M_[7--><div></div><!--M_*7 #div/0--><!--M_]6 #text/0--><!--M_]2 #text/1--><!--M_[9--><!--M_[10--><!--M_[12--><!--M_[13--><div></div><!--M_*13 #div/0--><!--M_]12 #text/0--><!--M_]11 #text/0--><!--M_[15--><!--M_[16--><div></div><!--M_*16 #div/0--><!--M_]15 #text/0--><!--M_]11 #text/1--><!--M_]9 #text/0--><!--M_[18--><!--M_[20--><!--M_[21--><div></div><!--M_*21 #div/0--><!--M_]20 #text/0--><!--M_]19 #text/0--><!--M_[23--><!--M_[24--><div></div><!--M_*24 #div/0--><!--M_]23 #text/0--><!--M_]19 #text/1--><!--M_]9 #text/1--><!--M_]1 #text/1--><section><!--M_[28--><div></div><!--M_*28 #div/0--><!--M_]27 #text/0--></section><!--M_|1 #text/2 26--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.t={1:_.a={"1?":_.u=new Set,"2?":_.w=new Set,"#text/1!":_.f={"#text/0!":_.g={"3?":_.v=new Set},"#text/0(":"__tests__/template.marko_2_renderer","#text/1!":_.l={"3?":_.x=new Set},"#text/1(":"__tests__/template.marko_2_renderer"},"#text/1(":"__tests__/tags/thing.marko","4?":_.y=new Set,"#text/2!":_.q={},"#text/2(":"section"},2:{"#text/0!":_.b={"#scopeOffset/1":5,"#text/0!":_.c={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.c)},"#text/0(":"__tests__/template.marko_1_renderer","#text/1!":_.d={"#scopeOffset/1":8,"#text/0!":_.e={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.e)},"#text/1(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c,6:_.d,7:_.e,9:_.f,10:_.g,11:{"#text/0!":_.h={"#scopeOffset/1":14,"#text/0!":_.i={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.i)},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.j={"#scopeOffset/1":17,"#text/0!":_.k={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.k)},"#text/1(":"__tests__/template.marko_3_renderer"},12:_.h,13:_.i,15:_.j,16:_.k,18:_.l,19:{"#text/0!":_.m={"#scopeOffset/1":22,"#text/0!":_.n={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.n)},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.o={"#scopeOffset/1":25,"#text/0!":_.p={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.p)},"#text/1(":"__tests__/template.marko_3_renderer"},20:_.m,21:_.n,23:_.o,24:_.p,26:_.q,27:_.r={"#scopeOffset/1":29,"#text/0!":_.s={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.s)},28:_.s},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.c["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),_.e["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.d),_.i["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.h),_.k["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.j),_.n["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.m),_.p["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.o),_.s["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.r),(_.u).add(_.b),(_.u).add(_.d),(_.v).add(_.h),(_.v).add(_.j),(_.w).add(_.g),(_.x).add(_.m),(_.x).add(_.o),(_.w).add(_.l),(_.y).add(_.r),_.t),1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()</script>
 ```
 
 # Render End
@@ -58,7 +58,7 @@
     </section>
     <!--M_|1 #text/2 26-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.w={1:_.a={"1?":_.x=new Set,"2?":_.z=new Set,"#text/1!":_.b={"#text/0!":_.h={"3?":_.y=new Set},"#text/1!":_.n={"3?":_.A=new Set}},"#text/1(":_._["__tests__/tags/thing.marko"],"4?":_.B=new Set,"#text/2!":_.t={},"#text/2(":"section"},2:{"#text/0!":_.c={"#scopeOffset/1":5,"#text/0!":_.d={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.d)},"#text/0(":_.g=_._["__tests__/template.marko_1_renderer"](_.a),"#text/1!":_.e={"#scopeOffset/1":8,"#text/0!":_.f={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.f)},"#text/1(":_.g},3:_.c,4:_.d,6:_.e,7:_.f,9:_.b,10:_.h,11:{"#text/0!":_.i={"#scopeOffset/1":14,"#text/0!":_.j={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.j)},"#text/0(":_.m=_._["__tests__/template.marko_3_renderer"](_.h),"#text/1!":_.k={"#scopeOffset/1":17,"#text/0!":_.l={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.l)},"#text/1(":_.m},12:_.i,13:_.j,15:_.k,16:_.l,18:_.n,19:{"#text/0!":_.o={"#scopeOffset/1":22,"#text/0!":_.p={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.p)},"#text/0(":_.s=_._["__tests__/template.marko_3_renderer"](_.n),"#text/1!":_.q={"#scopeOffset/1":25,"#text/0!":_.r={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.r)},"#text/1(":_.s},20:_.o,21:_.p,23:_.q,24:_.r,26:_.t,27:_.u={"#scopeOffset/1":29,"#text/0!":_.v={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.v)},28:_.v},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.b["#text/0("]=_.b["#text/1("]=_._["__tests__/template.marko_2_renderer"](_.a),_.d["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.f["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.j["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.i),_.l["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.k),_.p["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.o),_.r["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.q),_.v["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.u),(_.x).add(_.c),(_.x).add(_.e),(_.y).add(_.i),(_.y).add(_.k),(_.z).add(_.h),(_.A).add(_.o),(_.A).add(_.q),(_.z).add(_.n),(_.B).add(_.u),_.w),1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.t={1:_.a={"1?":_.u=new Set,"2?":_.w=new Set,"#text/1!":_.f={"#text/0!":_.g={"3?":_.v=new Set},"#text/0(":"__tests__/template.marko_2_renderer","#text/1!":_.l={"3?":_.x=new Set},"#text/1(":"__tests__/template.marko_2_renderer"},"#text/1(":"__tests__/tags/thing.marko","4?":_.y=new Set,"#text/2!":_.q={},"#text/2(":"section"},2:{"#text/0!":_.b={"#scopeOffset/1":5,"#text/0!":_.c={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.c)},"#text/0(":"__tests__/template.marko_1_renderer","#text/1!":_.d={"#scopeOffset/1":8,"#text/0!":_.e={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.e)},"#text/1(":"__tests__/template.marko_1_renderer"},3:_.b,4:_.c,6:_.d,7:_.e,9:_.f,10:_.g,11:{"#text/0!":_.h={"#scopeOffset/1":14,"#text/0!":_.i={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.i)},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.j={"#scopeOffset/1":17,"#text/0!":_.k={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.k)},"#text/1(":"__tests__/template.marko_3_renderer"},12:_.h,13:_.i,15:_.j,16:_.k,18:_.l,19:{"#text/0!":_.m={"#scopeOffset/1":22,"#text/0!":_.n={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.n)},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.o={"#scopeOffset/1":25,"#text/0!":_.p={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.p)},"#text/1(":"__tests__/template.marko_3_renderer"},20:_.m,21:_.n,23:_.o,24:_.p,26:_.q,27:_.r={"#scopeOffset/1":29,"#text/0!":_.s={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.s)},28:_.s},_.a._hoisted_setHtml=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.a),_.c["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.b),_.e["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.d),_.i["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.h),_.k["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.j),_.n["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.m),_.p["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.o),_.s["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.r),(_.u).add(_.b),(_.u).add(_.d),(_.v).add(_.h),(_.v).add(_.j),(_.w).add(_.g),(_.x).add(_.m),(_.x).add(_.o),(_.w).add(_.l),(_.y).add(_.r),_.t),1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_setHtml",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/html.expected/tags/child.js
index c3590acaf7..21ad78c4aa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const el = _$.nodeRef();
   _$.write(`<div></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
@@ -8,5 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/child.marko_0/_return", _scope0_id);
   _$.writeScope(_scope0_id, {}, "__tests__/tags/child.marko", 0);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/html.expected/template.js
index 6c2c3ee1ce..6c051c54a6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import Child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const _scope2_ = new Map();
@@ -14,7 +14,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _scope1_.set(_value, _$.ensureScopeWithId(_scope1_id));
     _$.writeScope(_scope1_id, {
       "#text/0!": _$.writeExistingScope(_dynamicScope),
-      "#text/0(": _$.normalizeDynamicRenderer(1 && Child),
+      "#text/0(": _$.dynamicTagId(1 && Child),
       setHtml
     }, "__tests__/template.marko", "3:2");
   });
@@ -28,7 +28,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _scope2_.set(_value2, _$.ensureScopeWithId(_scope2_id));
     _$.writeScope(_scope2_id, {
       "#text/0!": _$.writeExistingScope(_dynamicScope2),
-      "#text/0(": _$.normalizeDynamicRenderer(1 && Child),
+      "#text/0(": _$.dynamicTagId(1 && Child),
       setHtml2
     }, "__tests__/template.marko", "14:2");
   }, _scope0_id, "#text/1");
@@ -45,7 +45,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
       _scope4_.set(j, _$.ensureScopeWithId(_scope4_id));
       _$.writeScope(_scope4_id, {
         "#text/0!": _$.writeExistingScope(_dynamicScope3),
-        "#text/0(": _$.normalizeDynamicRenderer(1 && Child),
+        "#text/0(": _$.dynamicTagId(1 && Child),
         setHtml3
       }, "__tests__/template.marko", "26:4");
     }, 1);
@@ -66,5 +66,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _hoisted_setHtml3: "27:20"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/resume.expected.md
index 85c38f0ab3..1b72419e27 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/resume.expected.md
@@ -156,7 +156,7 @@
       <!--M_]81 #text/0-->
     </ul>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.lb={1:_.a={"#text/0(":new Map(_.b=[[0,_.c={"#scopeOffset/1":4,"#text/0!":_.d={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.d)}],[1,_.e={"#scopeOffset/1":7,"#text/0!":_.f={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.f)}],[2,_.g={"#scopeOffset/1":10,"#text/0!":_.h={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.h)}],[3,_.i={"#scopeOffset/1":13,"#text/0!":_.j={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.j)}],[4,_.k={"#scopeOffset/1":16,"#text/0!":_.l={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.l)}],[5,_.m={"#scopeOffset/1":19,"#text/0!":_.n={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.n)}]]),"#text/1(":new Map(_.o=[[0,_.p={"#scopeOffset/1":22,"#text/0!":_.q={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.q)}],[1,_.r={"#scopeOffset/1":25,"#text/0!":_.s={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.s)}],[2,_.t={"#scopeOffset/1":28,"#text/0!":_.u={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.u)}],[3,_.v={"#scopeOffset/1":31,"#text/0!":_.w={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.w)}]]),"#text/2(":new Map(_.x=[[0,_.hb={"#ul/0(":new Map(_.y=[[0,_.z={"#scopeOffset/1":35,"#text/0!":_.A={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.A)}],[1,_.B={"#scopeOffset/1":38,"#text/0!":_.C={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.C)}],[2,_.D={"#scopeOffset/1":41,"#text/0!":_.E={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.E)}],[3,_.F={"#scopeOffset/1":44,"#text/0!":_.G={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.G)}]])}],[1,_.ib={"#ul/0(":new Map(_.H=[[0,_.I={"#scopeOffset/1":48,"#text/0!":_.J={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.J)}],[1,_.K={"#scopeOffset/1":51,"#text/0!":_.L={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.L)}],[2,_.M={"#scopeOffset/1":54,"#text/0!":_.N={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.N)}],[3,_.O={"#scopeOffset/1":57,"#text/0!":_.P={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.P)}]])}],[2,_.jb={"#ul/0(":new Map(_.Q=[[0,_.R={"#scopeOffset/1":61,"#text/0!":_.S={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.S)}],[1,_.T={"#scopeOffset/1":64,"#text/0!":_.U={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.U)}],[2,_.V={"#scopeOffset/1":67,"#text/0!":_.W={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.W)}],[3,_.X={"#scopeOffset/1":70,"#text/0!":_.Y={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.Y)}]])}],[3,_.kb={"#ul/0(":new Map(_.Z=[[0,_.$={"#scopeOffset/1":74,"#text/0!":_.ab={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.ab)}],[1,_.bb={"#scopeOffset/1":77,"#text/0!":_.cb={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.cb)}],[2,_.db={"#scopeOffset/1":80,"#text/0!":_.eb={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.eb)}],[3,_.fb={"#scopeOffset/1":83,"#text/0!":_.gb={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.gb)}]])}]])},2:_.c,3:_.d,5:_.e,6:_.f,8:_.g,9:_.h,11:_.i,12:_.j,14:_.k,15:_.l,17:_.m,18:_.n,20:_.p,21:_.q,23:_.r,24:_.s,26:_.t,27:_.u,29:_.v,30:_.w,32:_.hb,33:_.z,34:_.A,36:_.B,37:_.C,39:_.D,40:_.E,42:_.F,43:_.G,45:_.ib,46:_.I,47:_.J,49:_.K,50:_.L,52:_.M,53:_.N,55:_.O,56:_.P,58:_.jb,59:_.R,60:_.S,62:_.T,63:_.U,65:_.V,66:_.W,68:_.X,69:_.Y,71:_.kb,72:_.$,73:_.ab,75:_.bb,76:_.cb,78:_.db,79:_.eb,81:_.fb,82:_.gb},_.a._hoisted_setHtml3=_._["__tests__/template.marko_0__hoisted_setHtml3/hoist"](_.a),_.d["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.f["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.h["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.g),_.j["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.i),_.l["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.k),_.n["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.m),_.q["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.p),_.s["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.r),_.u["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.t),_.w["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.v),_.A["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.z),_.C["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.B),_.E["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.D),_.G["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.F),_.J["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.I),_.L["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.K),_.N["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.M),_.P["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.O),_.S["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.R),_.U["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.T),_.W["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.V),_.Y["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.X),_.ab["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.$),_.cb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.bb),_.eb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.db),_.gb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.fb),_.lb),1,"__tests__/template.marko_0__hoisted_setHtml3",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.lb={1:_.a={"#text/0(":new Map(_.b=[[0,_.c={"#scopeOffset/1":4,"#text/0!":_.d={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.d)}],[1,_.e={"#scopeOffset/1":7,"#text/0!":_.f={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.f)}],[2,_.g={"#scopeOffset/1":10,"#text/0!":_.h={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.h)}],[3,_.i={"#scopeOffset/1":13,"#text/0!":_.j={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.j)}],[4,_.k={"#scopeOffset/1":16,"#text/0!":_.l={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.l)}],[5,_.m={"#scopeOffset/1":19,"#text/0!":_.n={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.n)}]]),"#text/1(":new Map(_.o=[[0,_.p={"#scopeOffset/1":22,"#text/0!":_.q={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.q)}],[1,_.r={"#scopeOffset/1":25,"#text/0!":_.s={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.s)}],[2,_.t={"#scopeOffset/1":28,"#text/0!":_.u={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.u)}],[3,_.v={"#scopeOffset/1":31,"#text/0!":_.w={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.w)}]]),"#text/2(":new Map(_.x=[[0,_.hb={"#ul/0(":new Map(_.y=[[0,_.z={"#scopeOffset/1":35,"#text/0!":_.A={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.A)}],[1,_.B={"#scopeOffset/1":38,"#text/0!":_.C={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.C)}],[2,_.D={"#scopeOffset/1":41,"#text/0!":_.E={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.E)}],[3,_.F={"#scopeOffset/1":44,"#text/0!":_.G={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.G)}]])}],[1,_.ib={"#ul/0(":new Map(_.H=[[0,_.I={"#scopeOffset/1":48,"#text/0!":_.J={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.J)}],[1,_.K={"#scopeOffset/1":51,"#text/0!":_.L={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.L)}],[2,_.M={"#scopeOffset/1":54,"#text/0!":_.N={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.N)}],[3,_.O={"#scopeOffset/1":57,"#text/0!":_.P={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.P)}]])}],[2,_.jb={"#ul/0(":new Map(_.Q=[[0,_.R={"#scopeOffset/1":61,"#text/0!":_.S={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.S)}],[1,_.T={"#scopeOffset/1":64,"#text/0!":_.U={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.U)}],[2,_.V={"#scopeOffset/1":67,"#text/0!":_.W={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.W)}],[3,_.X={"#scopeOffset/1":70,"#text/0!":_.Y={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.Y)}]])}],[3,_.kb={"#ul/0(":new Map(_.Z=[[0,_.$={"#scopeOffset/1":74,"#text/0!":_.ab={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.ab)}],[1,_.bb={"#scopeOffset/1":77,"#text/0!":_.cb={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.cb)}],[2,_.db={"#scopeOffset/1":80,"#text/0!":_.eb={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.eb)}],[3,_.fb={"#scopeOffset/1":83,"#text/0!":_.gb={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.gb)}]])}]])},2:_.c,3:_.d,5:_.e,6:_.f,8:_.g,9:_.h,11:_.i,12:_.j,14:_.k,15:_.l,17:_.m,18:_.n,20:_.p,21:_.q,23:_.r,24:_.s,26:_.t,27:_.u,29:_.v,30:_.w,32:_.hb,33:_.z,34:_.A,36:_.B,37:_.C,39:_.D,40:_.E,42:_.F,43:_.G,45:_.ib,46:_.I,47:_.J,49:_.K,50:_.L,52:_.M,53:_.N,55:_.O,56:_.P,58:_.jb,59:_.R,60:_.S,62:_.T,63:_.U,65:_.V,66:_.W,68:_.X,69:_.Y,71:_.kb,72:_.$,73:_.ab,75:_.bb,76:_.cb,78:_.db,79:_.eb,81:_.fb,82:_.gb},_.a._hoisted_setHtml3=_._["__tests__/template.marko_0__hoisted_setHtml3/hoist"](_.a),_.d["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.f["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.h["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.g),_.j["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.i),_.l["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.k),_.n["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.m),_.q["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.p),_.s["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.r),_.u["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.t),_.w["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.v),_.A["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.z),_.C["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.B),_.E["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.D),_.G["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.F),_.J["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.I),_.L["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.K),_.N["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.M),_.P["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.O),_.S["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.R),_.U["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.T),_.W["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.V),_.Y["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.X),_.ab["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.$),_.cb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.bb),_.eb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.db),_.gb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.fb),_.lb),1,"__tests__/template.marko_0__hoisted_setHtml3",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/ssr.expected.md
index 34bcb7e2e4..8d99804fb7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var-many/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[3--><div></div><!--M_*3 #div/0--><!--M_]2 #text/0--><!--M_[6--><div></div><!--M_*6 #div/0--><!--M_]5 #text/0--><!--M_[9--><div></div><!--M_*9 #div/0--><!--M_]8 #text/0--><!--M_[12--><div></div><!--M_*12 #div/0--><!--M_]11 #text/0--><!--M_[15--><div></div><!--M_*15 #div/0--><!--M_]14 #text/0--><!--M_[18--><div></div><!--M_*18 #div/0--><!--M_]17 #text/0--><hr><!--M_[21--><div></div><!--M_*21 #div/0--><!--M_]20 #text/0--><!--M_[24--><div></div><!--M_*24 #div/0--><!--M_]23 #text/0--><!--M_[27--><div></div><!--M_*27 #div/0--><!--M_]26 #text/0--><!--M_[30--><div></div><!--M_*30 #div/0--><!--M_]29 #text/0--><!--M_|1 #text/1 29 26 23 20--><hr><ul><!--M_[34--><div></div><!--M_*34 #div/0--><!--M_]33 #text/0--><!--M_[37--><div></div><!--M_*37 #div/0--><!--M_]36 #text/0--><!--M_[40--><div></div><!--M_*40 #div/0--><!--M_]39 #text/0--><!--M_[43--><div></div><!--M_*43 #div/0--><!--M_]42 #text/0--></ul><ul><!--M_[47--><div></div><!--M_*47 #div/0--><!--M_]46 #text/0--><!--M_[50--><div></div><!--M_*50 #div/0--><!--M_]49 #text/0--><!--M_[53--><div></div><!--M_*53 #div/0--><!--M_]52 #text/0--><!--M_[56--><div></div><!--M_*56 #div/0--><!--M_]55 #text/0--></ul><ul><!--M_[60--><div></div><!--M_*60 #div/0--><!--M_]59 #text/0--><!--M_[63--><div></div><!--M_*63 #div/0--><!--M_]62 #text/0--><!--M_[66--><div></div><!--M_*66 #div/0--><!--M_]65 #text/0--><!--M_[69--><div></div><!--M_*69 #div/0--><!--M_]68 #text/0--></ul><ul><!--M_[73--><div></div><!--M_*73 #div/0--><!--M_]72 #text/0--><!--M_[76--><div></div><!--M_*76 #div/0--><!--M_]75 #text/0--><!--M_[79--><div></div><!--M_*79 #div/0--><!--M_]78 #text/0--><!--M_[82--><div></div><!--M_*82 #div/0--><!--M_]81 #text/0--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.lb={1:_.a={"#text/0(":new Map(_.b=[[0,_.c={"#scopeOffset/1":4,"#text/0!":_.d={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.d)}],[1,_.e={"#scopeOffset/1":7,"#text/0!":_.f={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.f)}],[2,_.g={"#scopeOffset/1":10,"#text/0!":_.h={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.h)}],[3,_.i={"#scopeOffset/1":13,"#text/0!":_.j={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.j)}],[4,_.k={"#scopeOffset/1":16,"#text/0!":_.l={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.l)}],[5,_.m={"#scopeOffset/1":19,"#text/0!":_.n={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.n)}]]),"#text/1(":new Map(_.o=[[0,_.p={"#scopeOffset/1":22,"#text/0!":_.q={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.q)}],[1,_.r={"#scopeOffset/1":25,"#text/0!":_.s={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.s)}],[2,_.t={"#scopeOffset/1":28,"#text/0!":_.u={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.u)}],[3,_.v={"#scopeOffset/1":31,"#text/0!":_.w={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.w)}]]),"#text/2(":new Map(_.x=[[0,_.hb={"#ul/0(":new Map(_.y=[[0,_.z={"#scopeOffset/1":35,"#text/0!":_.A={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.A)}],[1,_.B={"#scopeOffset/1":38,"#text/0!":_.C={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.C)}],[2,_.D={"#scopeOffset/1":41,"#text/0!":_.E={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.E)}],[3,_.F={"#scopeOffset/1":44,"#text/0!":_.G={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.G)}]])}],[1,_.ib={"#ul/0(":new Map(_.H=[[0,_.I={"#scopeOffset/1":48,"#text/0!":_.J={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.J)}],[1,_.K={"#scopeOffset/1":51,"#text/0!":_.L={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.L)}],[2,_.M={"#scopeOffset/1":54,"#text/0!":_.N={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.N)}],[3,_.O={"#scopeOffset/1":57,"#text/0!":_.P={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.P)}]])}],[2,_.jb={"#ul/0(":new Map(_.Q=[[0,_.R={"#scopeOffset/1":61,"#text/0!":_.S={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.S)}],[1,_.T={"#scopeOffset/1":64,"#text/0!":_.U={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.U)}],[2,_.V={"#scopeOffset/1":67,"#text/0!":_.W={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.W)}],[3,_.X={"#scopeOffset/1":70,"#text/0!":_.Y={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.Y)}]])}],[3,_.kb={"#ul/0(":new Map(_.Z=[[0,_.$={"#scopeOffset/1":74,"#text/0!":_.ab={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.ab)}],[1,_.bb={"#scopeOffset/1":77,"#text/0!":_.cb={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.cb)}],[2,_.db={"#scopeOffset/1":80,"#text/0!":_.eb={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.eb)}],[3,_.fb={"#scopeOffset/1":83,"#text/0!":_.gb={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.gb)}]])}]])},2:_.c,3:_.d,5:_.e,6:_.f,8:_.g,9:_.h,11:_.i,12:_.j,14:_.k,15:_.l,17:_.m,18:_.n,20:_.p,21:_.q,23:_.r,24:_.s,26:_.t,27:_.u,29:_.v,30:_.w,32:_.hb,33:_.z,34:_.A,36:_.B,37:_.C,39:_.D,40:_.E,42:_.F,43:_.G,45:_.ib,46:_.I,47:_.J,49:_.K,50:_.L,52:_.M,53:_.N,55:_.O,56:_.P,58:_.jb,59:_.R,60:_.S,62:_.T,63:_.U,65:_.V,66:_.W,68:_.X,69:_.Y,71:_.kb,72:_.$,73:_.ab,75:_.bb,76:_.cb,78:_.db,79:_.eb,81:_.fb,82:_.gb},_.a._hoisted_setHtml3=_._["__tests__/template.marko_0__hoisted_setHtml3/hoist"](_.a),_.d["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.f["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.h["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.g),_.j["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.i),_.l["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.k),_.n["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.m),_.q["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.p),_.s["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.r),_.u["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.t),_.w["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.v),_.A["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.z),_.C["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.B),_.E["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.D),_.G["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.F),_.J["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.I),_.L["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.K),_.N["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.M),_.P["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.O),_.S["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.R),_.U["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.T),_.W["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.V),_.Y["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.X),_.ab["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.$),_.cb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.bb),_.eb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.db),_.gb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.fb),_.lb),1,"__tests__/template.marko_0__hoisted_setHtml3",1,"__tests__/template.marko_0",0];M._.w()</script>
+  <!--M_[3--><div></div><!--M_*3 #div/0--><!--M_]2 #text/0--><!--M_[6--><div></div><!--M_*6 #div/0--><!--M_]5 #text/0--><!--M_[9--><div></div><!--M_*9 #div/0--><!--M_]8 #text/0--><!--M_[12--><div></div><!--M_*12 #div/0--><!--M_]11 #text/0--><!--M_[15--><div></div><!--M_*15 #div/0--><!--M_]14 #text/0--><!--M_[18--><div></div><!--M_*18 #div/0--><!--M_]17 #text/0--><hr><!--M_[21--><div></div><!--M_*21 #div/0--><!--M_]20 #text/0--><!--M_[24--><div></div><!--M_*24 #div/0--><!--M_]23 #text/0--><!--M_[27--><div></div><!--M_*27 #div/0--><!--M_]26 #text/0--><!--M_[30--><div></div><!--M_*30 #div/0--><!--M_]29 #text/0--><!--M_|1 #text/1 29 26 23 20--><hr><ul><!--M_[34--><div></div><!--M_*34 #div/0--><!--M_]33 #text/0--><!--M_[37--><div></div><!--M_*37 #div/0--><!--M_]36 #text/0--><!--M_[40--><div></div><!--M_*40 #div/0--><!--M_]39 #text/0--><!--M_[43--><div></div><!--M_*43 #div/0--><!--M_]42 #text/0--></ul><ul><!--M_[47--><div></div><!--M_*47 #div/0--><!--M_]46 #text/0--><!--M_[50--><div></div><!--M_*50 #div/0--><!--M_]49 #text/0--><!--M_[53--><div></div><!--M_*53 #div/0--><!--M_]52 #text/0--><!--M_[56--><div></div><!--M_*56 #div/0--><!--M_]55 #text/0--></ul><ul><!--M_[60--><div></div><!--M_*60 #div/0--><!--M_]59 #text/0--><!--M_[63--><div></div><!--M_*63 #div/0--><!--M_]62 #text/0--><!--M_[66--><div></div><!--M_*66 #div/0--><!--M_]65 #text/0--><!--M_[69--><div></div><!--M_*69 #div/0--><!--M_]68 #text/0--></ul><ul><!--M_[73--><div></div><!--M_*73 #div/0--><!--M_]72 #text/0--><!--M_[76--><div></div><!--M_*76 #div/0--><!--M_]75 #text/0--><!--M_[79--><div></div><!--M_*79 #div/0--><!--M_]78 #text/0--><!--M_[82--><div></div><!--M_*82 #div/0--><!--M_]81 #text/0--></ul><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.lb={1:_.a={"#text/0(":new Map(_.b=[[0,_.c={"#scopeOffset/1":4,"#text/0!":_.d={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.d)}],[1,_.e={"#scopeOffset/1":7,"#text/0!":_.f={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.f)}],[2,_.g={"#scopeOffset/1":10,"#text/0!":_.h={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.h)}],[3,_.i={"#scopeOffset/1":13,"#text/0!":_.j={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.j)}],[4,_.k={"#scopeOffset/1":16,"#text/0!":_.l={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.l)}],[5,_.m={"#scopeOffset/1":19,"#text/0!":_.n={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.n)}]]),"#text/1(":new Map(_.o=[[0,_.p={"#scopeOffset/1":22,"#text/0!":_.q={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.q)}],[1,_.r={"#scopeOffset/1":25,"#text/0!":_.s={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.s)}],[2,_.t={"#scopeOffset/1":28,"#text/0!":_.u={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.u)}],[3,_.v={"#scopeOffset/1":31,"#text/0!":_.w={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.w)}]]),"#text/2(":new Map(_.x=[[0,_.hb={"#ul/0(":new Map(_.y=[[0,_.z={"#scopeOffset/1":35,"#text/0!":_.A={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.A)}],[1,_.B={"#scopeOffset/1":38,"#text/0!":_.C={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.C)}],[2,_.D={"#scopeOffset/1":41,"#text/0!":_.E={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.E)}],[3,_.F={"#scopeOffset/1":44,"#text/0!":_.G={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.G)}]])}],[1,_.ib={"#ul/0(":new Map(_.H=[[0,_.I={"#scopeOffset/1":48,"#text/0!":_.J={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.J)}],[1,_.K={"#scopeOffset/1":51,"#text/0!":_.L={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.L)}],[2,_.M={"#scopeOffset/1":54,"#text/0!":_.N={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.N)}],[3,_.O={"#scopeOffset/1":57,"#text/0!":_.P={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.P)}]])}],[2,_.jb={"#ul/0(":new Map(_.Q=[[0,_.R={"#scopeOffset/1":61,"#text/0!":_.S={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.S)}],[1,_.T={"#scopeOffset/1":64,"#text/0!":_.U={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.U)}],[2,_.V={"#scopeOffset/1":67,"#text/0!":_.W={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.W)}],[3,_.X={"#scopeOffset/1":70,"#text/0!":_.Y={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.Y)}]])}],[3,_.kb={"#ul/0(":new Map(_.Z=[[0,_.$={"#scopeOffset/1":74,"#text/0!":_.ab={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.ab)}],[1,_.bb={"#scopeOffset/1":77,"#text/0!":_.cb={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.cb)}],[2,_.db={"#scopeOffset/1":80,"#text/0!":_.eb={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.eb)}],[3,_.fb={"#scopeOffset/1":83,"#text/0!":_.gb={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.gb)}]])}]])},2:_.c,3:_.d,5:_.e,6:_.f,8:_.g,9:_.h,11:_.i,12:_.j,14:_.k,15:_.l,17:_.m,18:_.n,20:_.p,21:_.q,23:_.r,24:_.s,26:_.t,27:_.u,29:_.v,30:_.w,32:_.hb,33:_.z,34:_.A,36:_.B,37:_.C,39:_.D,40:_.E,42:_.F,43:_.G,45:_.ib,46:_.I,47:_.J,49:_.K,50:_.L,52:_.M,53:_.N,55:_.O,56:_.P,58:_.jb,59:_.R,60:_.S,62:_.T,63:_.U,65:_.V,66:_.W,68:_.X,69:_.Y,71:_.kb,72:_.$,73:_.ab,75:_.bb,76:_.cb,78:_.db,79:_.eb,81:_.fb,82:_.gb},_.a._hoisted_setHtml3=_._["__tests__/template.marko_0__hoisted_setHtml3/hoist"](_.a),_.d["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.f["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.h["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.g),_.j["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.i),_.l["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.k),_.n["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.m),_.q["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.p),_.s["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.r),_.u["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.t),_.w["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.v),_.A["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.z),_.C["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.B),_.E["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.D),_.G["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.F),_.J["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.I),_.L["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.K),_.N["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.M),_.P["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.O),_.S["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.R),_.U["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.T),_.W["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.V),_.Y["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.X),_.ab["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.$),_.cb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.bb),_.eb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.db),_.gb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.fb),_.lb),1,"__tests__/template.marko_0__hoisted_setHtml3",1,"__tests__/template.marko_0",0];M._.w()</script>
 ```
 
 # Render End
@@ -124,7 +124,7 @@
       <!--M_]81 #text/0-->
     </ul>
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.lb={1:_.a={"#text/0(":new Map(_.b=[[0,_.c={"#scopeOffset/1":4,"#text/0!":_.d={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.d)}],[1,_.e={"#scopeOffset/1":7,"#text/0!":_.f={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.f)}],[2,_.g={"#scopeOffset/1":10,"#text/0!":_.h={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.h)}],[3,_.i={"#scopeOffset/1":13,"#text/0!":_.j={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.j)}],[4,_.k={"#scopeOffset/1":16,"#text/0!":_.l={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.l)}],[5,_.m={"#scopeOffset/1":19,"#text/0!":_.n={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.n)}]]),"#text/1(":new Map(_.o=[[0,_.p={"#scopeOffset/1":22,"#text/0!":_.q={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.q)}],[1,_.r={"#scopeOffset/1":25,"#text/0!":_.s={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.s)}],[2,_.t={"#scopeOffset/1":28,"#text/0!":_.u={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.u)}],[3,_.v={"#scopeOffset/1":31,"#text/0!":_.w={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.w)}]]),"#text/2(":new Map(_.x=[[0,_.hb={"#ul/0(":new Map(_.y=[[0,_.z={"#scopeOffset/1":35,"#text/0!":_.A={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.A)}],[1,_.B={"#scopeOffset/1":38,"#text/0!":_.C={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.C)}],[2,_.D={"#scopeOffset/1":41,"#text/0!":_.E={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.E)}],[3,_.F={"#scopeOffset/1":44,"#text/0!":_.G={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.G)}]])}],[1,_.ib={"#ul/0(":new Map(_.H=[[0,_.I={"#scopeOffset/1":48,"#text/0!":_.J={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.J)}],[1,_.K={"#scopeOffset/1":51,"#text/0!":_.L={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.L)}],[2,_.M={"#scopeOffset/1":54,"#text/0!":_.N={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.N)}],[3,_.O={"#scopeOffset/1":57,"#text/0!":_.P={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.P)}]])}],[2,_.jb={"#ul/0(":new Map(_.Q=[[0,_.R={"#scopeOffset/1":61,"#text/0!":_.S={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.S)}],[1,_.T={"#scopeOffset/1":64,"#text/0!":_.U={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.U)}],[2,_.V={"#scopeOffset/1":67,"#text/0!":_.W={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.W)}],[3,_.X={"#scopeOffset/1":70,"#text/0!":_.Y={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.Y)}]])}],[3,_.kb={"#ul/0(":new Map(_.Z=[[0,_.$={"#scopeOffset/1":74,"#text/0!":_.ab={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.ab)}],[1,_.bb={"#scopeOffset/1":77,"#text/0!":_.cb={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.cb)}],[2,_.db={"#scopeOffset/1":80,"#text/0!":_.eb={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.eb)}],[3,_.fb={"#scopeOffset/1":83,"#text/0!":_.gb={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.gb)}]])}]])},2:_.c,3:_.d,5:_.e,6:_.f,8:_.g,9:_.h,11:_.i,12:_.j,14:_.k,15:_.l,17:_.m,18:_.n,20:_.p,21:_.q,23:_.r,24:_.s,26:_.t,27:_.u,29:_.v,30:_.w,32:_.hb,33:_.z,34:_.A,36:_.B,37:_.C,39:_.D,40:_.E,42:_.F,43:_.G,45:_.ib,46:_.I,47:_.J,49:_.K,50:_.L,52:_.M,53:_.N,55:_.O,56:_.P,58:_.jb,59:_.R,60:_.S,62:_.T,63:_.U,65:_.V,66:_.W,68:_.X,69:_.Y,71:_.kb,72:_.$,73:_.ab,75:_.bb,76:_.cb,78:_.db,79:_.eb,81:_.fb,82:_.gb},_.a._hoisted_setHtml3=_._["__tests__/template.marko_0__hoisted_setHtml3/hoist"](_.a),_.d["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.f["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.h["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.g),_.j["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.i),_.l["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.k),_.n["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.m),_.q["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.p),_.s["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.r),_.u["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.t),_.w["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.v),_.A["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.z),_.C["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.B),_.E["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.D),_.G["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.F),_.J["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.I),_.L["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.K),_.N["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.M),_.P["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.O),_.S["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.R),_.U["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.T),_.W["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.V),_.Y["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.X),_.ab["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.$),_.cb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.bb),_.eb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.db),_.gb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.fb),_.lb),1,"__tests__/template.marko_0__hoisted_setHtml3",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.lb={1:_.a={"#text/0(":new Map(_.b=[[0,_.c={"#scopeOffset/1":4,"#text/0!":_.d={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.d)}],[1,_.e={"#scopeOffset/1":7,"#text/0!":_.f={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.f)}],[2,_.g={"#scopeOffset/1":10,"#text/0!":_.h={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.h)}],[3,_.i={"#scopeOffset/1":13,"#text/0!":_.j={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.j)}],[4,_.k={"#scopeOffset/1":16,"#text/0!":_.l={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.l)}],[5,_.m={"#scopeOffset/1":19,"#text/0!":_.n={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.n)}]]),"#text/1(":new Map(_.o=[[0,_.p={"#scopeOffset/1":22,"#text/0!":_.q={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.q)}],[1,_.r={"#scopeOffset/1":25,"#text/0!":_.s={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.s)}],[2,_.t={"#scopeOffset/1":28,"#text/0!":_.u={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.u)}],[3,_.v={"#scopeOffset/1":31,"#text/0!":_.w={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.w)}]]),"#text/2(":new Map(_.x=[[0,_.hb={"#ul/0(":new Map(_.y=[[0,_.z={"#scopeOffset/1":35,"#text/0!":_.A={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.A)}],[1,_.B={"#scopeOffset/1":38,"#text/0!":_.C={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.C)}],[2,_.D={"#scopeOffset/1":41,"#text/0!":_.E={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.E)}],[3,_.F={"#scopeOffset/1":44,"#text/0!":_.G={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.G)}]])}],[1,_.ib={"#ul/0(":new Map(_.H=[[0,_.I={"#scopeOffset/1":48,"#text/0!":_.J={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.J)}],[1,_.K={"#scopeOffset/1":51,"#text/0!":_.L={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.L)}],[2,_.M={"#scopeOffset/1":54,"#text/0!":_.N={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.N)}],[3,_.O={"#scopeOffset/1":57,"#text/0!":_.P={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.P)}]])}],[2,_.jb={"#ul/0(":new Map(_.Q=[[0,_.R={"#scopeOffset/1":61,"#text/0!":_.S={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.S)}],[1,_.T={"#scopeOffset/1":64,"#text/0!":_.U={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.U)}],[2,_.V={"#scopeOffset/1":67,"#text/0!":_.W={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.W)}],[3,_.X={"#scopeOffset/1":70,"#text/0!":_.Y={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.Y)}]])}],[3,_.kb={"#ul/0(":new Map(_.Z=[[0,_.$={"#scopeOffset/1":74,"#text/0!":_.ab={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.ab)}],[1,_.bb={"#scopeOffset/1":77,"#text/0!":_.cb={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.cb)}],[2,_.db={"#scopeOffset/1":80,"#text/0!":_.eb={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.eb)}],[3,_.fb={"#scopeOffset/1":83,"#text/0!":_.gb={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.gb)}]])}]])},2:_.c,3:_.d,5:_.e,6:_.f,8:_.g,9:_.h,11:_.i,12:_.j,14:_.k,15:_.l,17:_.m,18:_.n,20:_.p,21:_.q,23:_.r,24:_.s,26:_.t,27:_.u,29:_.v,30:_.w,32:_.hb,33:_.z,34:_.A,36:_.B,37:_.C,39:_.D,40:_.E,42:_.F,43:_.G,45:_.ib,46:_.I,47:_.J,49:_.K,50:_.L,52:_.M,53:_.N,55:_.O,56:_.P,58:_.jb,59:_.R,60:_.S,62:_.T,63:_.U,65:_.V,66:_.W,68:_.X,69:_.Y,71:_.kb,72:_.$,73:_.ab,75:_.bb,76:_.cb,78:_.db,79:_.eb,81:_.fb,82:_.gb},_.a._hoisted_setHtml3=_._["__tests__/template.marko_0__hoisted_setHtml3/hoist"](_.a),_.d["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.c),_.f["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.e),_.h["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.g),_.j["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.i),_.l["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.k),_.n["/"]=_._["__tests__/template.marko_1_setHtml/var"](_.m),_.q["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.p),_.s["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.r),_.u["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.t),_.w["/"]=_._["__tests__/template.marko_2_setHtml2/var"](_.v),_.A["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.z),_.C["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.B),_.E["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.D),_.G["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.F),_.J["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.I),_.L["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.K),_.N["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.M),_.P["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.O),_.S["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.R),_.U["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.T),_.W["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.V),_.Y["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.X),_.ab["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.$),_.cb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.bb),_.eb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.db),_.gb["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.fb),_.lb),1,"__tests__/template.marko_0__hoisted_setHtml3",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/html.expected/tags/child.js
index c3590acaf7..21ad78c4aa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const el = _$.nodeRef();
   _$.write(`<div></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
@@ -8,5 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/child.marko_0/_return", _scope0_id);
   _$.writeScope(_scope0_id, {}, "__tests__/tags/child.marko", 0);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/html.expected/tags/thing.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/html.expected/tags/thing.js
index a04a03fb69..bbfa4911e4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/html.expected/tags/thing.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/html.expected/tags/thing.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/thing.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.writeEffect(_scope0_id, "__tests__/tags/thing.marko_0_input_value");
   _$.writeScope(_scope0_id, {
@@ -7,5 +7,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/thing.marko", 0, {
     input_value: ["input.value"]
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/thing.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/html.expected/template.js
index c9a10ffdae..a96618791e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/html.expected/template.js
@@ -1,7 +1,7 @@
 import Child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _thing from "./tags/thing.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _hoisted_setHtml = _$.hoist(_scope0_id, "__tests__/template.marko_0__hoisted_setHtml/hoist");
   let _ifScopeId2, _ifBranch2;
@@ -20,7 +20,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
           _$.setTagVar(_scope2_id, "#scopeOffset/1", _dynamicScope, "__tests__/template.marko_2_setHtml/var");
           _$.writeScope(_scope2_id, {
             "#text/0!": _$.writeExistingScope(_dynamicScope),
-            "#text/0(": _$.normalizeDynamicRenderer(1 && Child),
+            "#text/0(": _$.dynamicTagId(1 && Child),
             setHtml
           }, "__tests__/template.marko", "4:4");
           _ifBranch = 0;
@@ -47,7 +47,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _$.setTagVar(_scope3_id, "#scopeOffset/1", _dynamicScope2, "__tests__/template.marko_3_setHtml2/var");
     _$.writeScope(_scope3_id, {
       "#text/0!": _$.writeExistingScope(_dynamicScope2),
-      "#text/0(": _$.normalizeDynamicRenderer(1 && Child),
+      "#text/0(": _$.dynamicTagId(1 && Child),
       setHtml2
     }, "__tests__/template.marko", "15:2");
     _ifScopeId3 = _scope3_id;
@@ -59,7 +59,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _$.setTagVar(_scope4_id, "#scopeOffset/1", _dynamicScope3, "__tests__/template.marko_4_setHtml3/var");
     _$.writeScope(_scope4_id, {
       "#text/0!": _$.writeExistingScope(_dynamicScope3),
-      "#text/0(": _$.normalizeDynamicRenderer(1 && Child),
+      "#text/0(": _$.dynamicTagId(1 && Child),
       setHtml3
     }, "__tests__/template.marko", "24:2");
     _ifScopeId4 = _scope4_id;
@@ -84,5 +84,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/template.marko", 0, {
     input_show: ["input.show"]
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/resume.expected.md
index 290801f0f5..bf4e129eaa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/resume.expected.md
@@ -25,7 +25,7 @@
     <!--M_*11 #div/0-->
     <!--M_]10 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.k={1:_.c={input_show:!0,"#text/0(":0,"#text/0!":_.d={"#text/0(":0,"#text/0!":_.a={"#scopeOffset/1":5,"#text/0!":_.b={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.b)}},"#childScope/1":_.e={},"#text/2!":_.f={"#scopeOffset/1":9,"#text/0!":_.g={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.g)},"#text/3!":_.h={"#scopeOffset/1":12,"#text/0!":_.i={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.i)},"#text/4!":_.j={}},2:_.d,3:_.a,4:_.b,6:_.e,7:_.f,8:_.g,10:_.h,11:_.i,13:_.j},_.b["/"]=_._["__tests__/template.marko_2_setHtml/var"](_.a),_.d._=_.j._=_.c,_.e.input_value=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.c),_.g["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.f),_.i["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.h),_.k),6,"__tests__/tags/thing.marko_0_input_value",13,"__tests__/template.marko_5",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.k={1:_.c={input_show:!0,"#text/0(":0,"#text/0!":_.d={"#text/0(":0,"#text/0!":_.a={"#scopeOffset/1":5,"#text/0!":_.b={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.b)}},"#childScope/1":_.e={},"#text/2!":_.f={"#scopeOffset/1":9,"#text/0!":_.g={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.g)},"#text/3!":_.h={"#scopeOffset/1":12,"#text/0!":_.i={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.i)},"#text/4!":_.j={}},2:_.d,3:_.a,4:_.b,6:_.e,7:_.f,8:_.g,10:_.h,11:_.i,13:_.j},_.b["/"]=_._["__tests__/template.marko_2_setHtml/var"](_.a),_.d._=_.j._=_.c,_.e.input_value=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.c),_.g["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.f),_.i["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.h),_.k),6,"__tests__/tags/thing.marko_0_input_value",13,"__tests__/template.marko_5",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/ssr.expected.md
index 99e95c99e6..9e55a0d51e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-dynamic-tag-var/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[4--><div></div><!--M_*4 #div/0--><!--M_]3 #text/0--><!--M_|2 #text/0 3--><!--M_|1 #text/0 2--><!--M_[8--><div></div><!--M_*8 #div/0--><!--M_]7 #text/0--><!--M_[11--><div></div><!--M_*11 #div/0--><!--M_]10 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.k={1:_.c={input_show:!0,"#text/0(":0,"#text/0!":_.d={"#text/0(":0,"#text/0!":_.a={"#scopeOffset/1":5,"#text/0!":_.b={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.b)}},"#childScope/1":_.e={},"#text/2!":_.f={"#scopeOffset/1":9,"#text/0!":_.g={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.g)},"#text/3!":_.h={"#scopeOffset/1":12,"#text/0!":_.i={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.i)},"#text/4!":_.j={}},2:_.d,3:_.a,4:_.b,6:_.e,7:_.f,8:_.g,10:_.h,11:_.i,13:_.j},_.b["/"]=_._["__tests__/template.marko_2_setHtml/var"](_.a),_.d._=_.j._=_.c,_.e.input_value=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.c),_.g["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.f),_.i["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.h),_.k),6,"__tests__/tags/thing.marko_0_input_value",13,"__tests__/template.marko_5",1,"__tests__/template.marko_0",0];M._.w()</script>
+  <!--M_[4--><div></div><!--M_*4 #div/0--><!--M_]3 #text/0--><!--M_|2 #text/0 3--><!--M_|1 #text/0 2--><!--M_[8--><div></div><!--M_*8 #div/0--><!--M_]7 #text/0--><!--M_[11--><div></div><!--M_*11 #div/0--><!--M_]10 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.k={1:_.c={input_show:!0,"#text/0(":0,"#text/0!":_.d={"#text/0(":0,"#text/0!":_.a={"#scopeOffset/1":5,"#text/0!":_.b={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.b)}},"#childScope/1":_.e={},"#text/2!":_.f={"#scopeOffset/1":9,"#text/0!":_.g={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.g)},"#text/3!":_.h={"#scopeOffset/1":12,"#text/0!":_.i={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.i)},"#text/4!":_.j={}},2:_.d,3:_.a,4:_.b,6:_.e,7:_.f,8:_.g,10:_.h,11:_.i,13:_.j},_.b["/"]=_._["__tests__/template.marko_2_setHtml/var"](_.a),_.d._=_.j._=_.c,_.e.input_value=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.c),_.g["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.f),_.i["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.h),_.k),6,"__tests__/tags/thing.marko_0_input_value",13,"__tests__/template.marko_5",1,"__tests__/template.marko_0",0];M._.w()</script>
 ```
 
 # Render End
@@ -23,7 +23,7 @@
     <!--M_*11 #div/0-->
     <!--M_]10 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.k={1:_.c={input_show:!0,"#text/0(":0,"#text/0!":_.d={"#text/0(":0,"#text/0!":_.a={"#scopeOffset/1":5,"#text/0!":_.b={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml:_._["__tests__/tags/child.marko_0/_return"](_.b)}},"#childScope/1":_.e={},"#text/2!":_.f={"#scopeOffset/1":9,"#text/0!":_.g={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.g)},"#text/3!":_.h={"#scopeOffset/1":12,"#text/0!":_.i={},"#text/0(":_._["__tests__/tags/child.marko"],setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.i)},"#text/4!":_.j={}},2:_.d,3:_.a,4:_.b,6:_.e,7:_.f,8:_.g,10:_.h,11:_.i,13:_.j},_.b["/"]=_._["__tests__/template.marko_2_setHtml/var"](_.a),_.d._=_.j._=_.c,_.e.input_value=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.c),_.g["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.f),_.i["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.h),_.k),6,"__tests__/tags/thing.marko_0_input_value",13,"__tests__/template.marko_5",1,"__tests__/template.marko_0",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.k={1:_.c={input_show:!0,"#text/0(":0,"#text/0!":_.d={"#text/0(":0,"#text/0!":_.a={"#scopeOffset/1":5,"#text/0!":_.b={},"#text/0(":"__tests__/tags/child.marko",setHtml:_._["__tests__/tags/child.marko_0/_return"](_.b)}},"#childScope/1":_.e={},"#text/2!":_.f={"#scopeOffset/1":9,"#text/0!":_.g={},"#text/0(":"__tests__/tags/child.marko",setHtml2:_._["__tests__/tags/child.marko_0/_return"](_.g)},"#text/3!":_.h={"#scopeOffset/1":12,"#text/0!":_.i={},"#text/0(":"__tests__/tags/child.marko",setHtml3:_._["__tests__/tags/child.marko_0/_return"](_.i)},"#text/4!":_.j={}},2:_.d,3:_.a,4:_.b,6:_.e,7:_.f,8:_.g,10:_.h,11:_.i,13:_.j},_.b["/"]=_._["__tests__/template.marko_2_setHtml/var"](_.a),_.d._=_.j._=_.c,_.e.input_value=_._["__tests__/template.marko_0__hoisted_setHtml/hoist"](_.c),_.g["/"]=_._["__tests__/template.marko_3_setHtml2/var"](_.f),_.i["/"]=_._["__tests__/template.marko_4_setHtml3/var"](_.h),_.k),6,"__tests__/tags/thing.marko_0_input_value",13,"__tests__/template.marko_5",1,"__tests__/template.marko_0",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/dom.expected/template.hydrate.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/dom.expected/template.hydrate.js
index 796c8f34bb..d09d6dc3c3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/dom.expected/template.hydrate.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/dom.expected/template.hydrate.js
@@ -1,4 +1,4 @@
-// size: 822 (min) 343 (brotli)
+// size: 767 (min) 335 (brotli)
 const _dynamicTag2 = _$.dynamicTag(1),
   _dynamicTag = _$.dynamicTag(),
   _input_content_ = _$.value(4, (_scope, input_content) => {
@@ -8,14 +8,7 @@ const _dynamicTag2 = _$.dynamicTag(1),
 _$.registerContent("b0", "<p></p>", " ", 0, 0, "4?");
 const _get_hoisted_el2 = _$.register("b2", _$.hoist("0>", "3?"));
 _$.register("b3", _$.hoist("0>", "3?", "2?"));
-const _child_content2 = _$.registerContent(
-    "b1",
-    "<div></div>",
-    " ",
-    0,
-    0,
-    "3?",
-  ),
+const _child_content2 = _$.createContent("b1", "<div></div>", " ", 0, 0, "3?"),
   _hoisted_el2$inputShowChildNull_content_effect = _$.effect(
     "b5",
     ({ 1: _hoisted_el2 }) => {
@@ -40,7 +33,6 @@ _$.registerContent(
   "2?",
 ),
   _$.register("b7", _$.hoist("0>", "1?")),
-  _$.registerContent("b6", "<span></span>", " ", 0, 0, "1?"),
   _$.effect("b8", ({ 7: _hoisted_el3 }) => {
     for (const element of 7) element().classList.add("outer");
   }),
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/dom.expected/template.js
index 55ca7d284c..f4f488ff86 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/dom.expected/template.js
@@ -7,7 +7,7 @@ const _get_hoisted_el = _$.hoist("#p/0>", "4?");
 const _inputShowSectionNull_content = _$.registerContent("__tests__/template.marko_4_renderer", "<p></p>", /* get */" ", 0, 0, "4?");
 const _get_hoisted_el2 = _$.register("__tests__/template.marko_2__hoisted_el2/hoist", _$.hoist("#div/0>", "3?"));
 const _get_hoisted_el3 = _$.register("__tests__/template.marko_0__hoisted_el3/hoist", _$.hoist("#div/0>", "3?", "2?"));
-const _child_content2 = _$.registerContent("__tests__/template.marko_3_renderer", "<div></div>", /* get */" ", 0, 0, "3?");
+const _child_content2 = /* @__PURE__ */_$.createContent("__tests__/template.marko_3_renderer", "<div></div>", /* get */" ", 0, 0, "3?");
 const _hoisted_el2$inputShowChildNull_content_effect = _$.effect("__tests__/template.marko_2__hoisted_el2", ({
   _hoisted_el2
 }) => {
@@ -23,7 +23,7 @@ const _setup$inputShowChildNull_content = _scope => {
 };
 const _inputShowChildNull_content = _$.registerContent("__tests__/template.marko_2_renderer", `<!>${_child_template}<!>`, /* beginChild, _child_walks, endChild */`D/${_child_walks}&D`, _setup$inputShowChildNull_content, 0, "2?");
 const _get_hoisted_el4 = _$.register("__tests__/template.marko_0__hoisted_el/hoist", _$.hoist("#span/0>", "1?"));
-const _child_content = _$.registerContent("__tests__/template.marko_1_renderer", "<span></span>", /* get */" ", 0, 0, "1?");
+const _child_content = /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", "<span></span>", /* get */" ", 0, 0, "1?");
 const _dynamicTag2 = /* @__PURE__ */_$.dynamicTag("#text/2", _inputShowSectionNull_content);
 const _dynamicTag = /* @__PURE__ */_$.dynamicTag("#text/1", _inputShowChildNull_content);
 const _hoisted_el2_effect = _$.effect("__tests__/template.marko_0__hoisted_el3", ({
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/html.expected/tags/child.js
index 3608fce55c..32d284ac5e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", input.content, {});
@@ -7,9 +7,8 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.dynamicTagInput(_scope0_id, "#text/1", input.content, {});
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(input.content),
+    "#text/0(": _$.dynamicTagId(input.content),
     "#text/1!": _$.writeExistingScope(_dynamicScope2),
-    "#text/1(": _$.normalizeDynamicRenderer(input.content)
+    "#text/1(": _$.dynamicTagId(input.content)
   }, "__tests__/tags/child.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/html.expected/template.js
index c5af395ad8..74433de8bb 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/html.expected/template.js
@@ -1,7 +1,7 @@
 import Child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _hoisted_el = _$.hoist(_scope0_id, "__tests__/template.marko_0__hoisted_el/hoist");
   const _child_content_subscribers = new Set();
@@ -9,25 +9,25 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   const _inputShowChildNull_content_subscribers = new Set();
   const _inputShowSectionNull_content_subscribers = new Set();
   _child({
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       const el = _$.nodeRef();
       _$.write(`<span></span>${_$.markResumeNode(_scope1_id, "#span/0")}`);
       _$.writeSubscribe(_child_content_subscribers, _$.writeScope(_scope1_id, {}, "__tests__/template.marko", "3:2"));
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   });
   const _dynamicScope = _$.peekNextScope();
-  _$.dynamicTagInput(_scope0_id, "#text/1", input.show ? Child : null, {}, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  _$.dynamicTagInput(_scope0_id, "#text/1", input.show ? Child : null, {}, _$.registerContent("__tests__/template.marko_2_renderer", () => {
     const _scope2_id = _$.nextScopeId();
     const _hoisted_el2 = _$.hoist(_scope2_id, "__tests__/template.marko_2__hoisted_el2/hoist");
     const _child_content2_subscribers = new Set();
     _child({
-      content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+      content: /* @__PURE__ */_$.createContent("__tests__/template.marko_3_renderer", () => {
         const _scope3_id = _$.nextScopeId();
         const el2 = _$.nodeRef();
         _$.write(`<div></div>${_$.markResumeNode(_scope3_id, "#div/0")}`);
         _$.writeSubscribe(_child_content2_subscribers, _$.writeScope(_scope3_id, {}, "__tests__/template.marko", "16:4"));
-      }), "__tests__/template.marko_3_renderer", _scope2_id)
+      })
     });
     _$.writeEffect(_scope2_id, "__tests__/template.marko_2__hoisted_el2");
     _$.writeSubscribe(_inputShowChildNull_content_subscribers, _$.writeScope(_scope2_id, {
@@ -37,14 +37,14 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     }, "__tests__/template.marko", "15:4", {
       _hoisted_el2: 0
     }));
-  }), "__tests__/template.marko_2_renderer", _scope0_id));
+  }, _scope0_id));
   const _dynamicScope2 = _$.peekNextScope();
-  _$.dynamicTagInput(_scope0_id, "#text/2", input.show ? 'section' : null, {}, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  _$.dynamicTagInput(_scope0_id, "#text/2", input.show ? 'section' : null, {}, _$.registerContent("__tests__/template.marko_4_renderer", () => {
     const _scope4_id = _$.nextScopeId();
     const el3 = _$.nodeRef();
     _$.write(`<p></p>${_$.markResumeNode(_scope4_id, "#p/0")}`);
     _$.writeSubscribe(_inputShowSectionNull_content_subscribers, _$.writeScope(_scope4_id, {}, "__tests__/template.marko", "34:4"));
-  }), "__tests__/template.marko_4_renderer", _scope0_id));
+  }, _scope0_id));
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0__hoisted_el3");
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0__hoisted_el");
@@ -54,13 +54,12 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     "1?": _child_content_subscribers,
     "2?": _inputShowChildNull_content_subscribers,
     "#text/1!": _$.writeExistingScope(_dynamicScope),
-    "#text/1(": _$.normalizeDynamicRenderer(input.show ? Child : null),
+    "#text/1(": _$.dynamicTagId(input.show ? Child : null),
     "4?": _inputShowSectionNull_content_subscribers,
     "#text/2!": _$.writeExistingScope(_dynamicScope2),
-    "#text/2(": _$.normalizeDynamicRenderer(input.show ? 'section' : null)
+    "#text/2(": _$.dynamicTagId(input.show ? 'section' : null)
   }, "__tests__/template.marko", 0, {
     _hoisted_el: 0,
     _hoisted_el3: 0
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/resume.expected.md
index 7c430ac463..69cf6b6e37 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/resume.expected.md
@@ -54,7 +54,7 @@
     </section>
     <!--M_|1 #text/2 14-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.o={1:_.a={"1?":_.p=new Set,"2?":_.r=new Set,"#text/1!":_.c={"#text/0!":_.b={"3?":_.q=new Set},"#text/1!":_.d={"3?":_.s=new Set}},"#text/1(":_._["__tests__/tags/child.marko"],"4?":_.t=new Set,"#text/2!":_.n={},"#text/2(":"section"},2:{"#text/0!":_.f={},"#text/0(":_.e=_._["__tests__/template.marko_1_renderer"](_.a),"#text/1!":_.g={},"#text/1(":_.e},3:_.f,4:_.g,5:_.c,6:_.b,7:{"#text/0!":_.i={},"#text/0(":_.h=_._["__tests__/template.marko_3_renderer"](_.b),"#text/1!":_.j={},"#text/1(":_.h},8:_.i,9:_.j,10:_.d,11:{"#text/0!":_.l={},"#text/0(":_.k=_._["__tests__/template.marko_3_renderer"](_.d),"#text/1!":_.m={},"#text/1(":_.k},12:_.l,13:_.m,14:_.n,15:_.u={}},_.b._=_.d._=_.a,_.a._hoisted_el=_._["__tests__/template.marko_0__hoisted_el/hoist"](_.a),_.a._hoisted_el3=_._["__tests__/template.marko_0__hoisted_el3/hoist"](_.a),_.b._hoisted_el2=_._["__tests__/template.marko_2__hoisted_el2/hoist"](_.b),_.c["#text/0("]=_.c["#text/1("]=_._["__tests__/template.marko_2_renderer"](_.a),_.d._hoisted_el2=_._["__tests__/template.marko_2__hoisted_el2/hoist"](_.d),(_.p).add(_.f),(_.p).add(_.g),(_.q).add(_.i),(_.q).add(_.j),(_.r).add(_.b),(_.s).add(_.l),(_.s).add(_.m),(_.r).add(_.d),(_.t).add(_.u),_.o),6,"__tests__/template.marko_2__hoisted_el2",10,"__tests__/template.marko_2__hoisted_el2",1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_el3",1,"__tests__/template.marko_0__hoisted_el",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.l={1:_.a={"1?":_.m=new Set,"2?":_.o=new Set,"#text/1!":_.f={"#text/0!":_.b={"3?":_.n=new Set},"#text/0(":"__tests__/template.marko_2_renderer","#text/1!":_.c={"3?":_.p=new Set},"#text/1(":"__tests__/template.marko_2_renderer"},"#text/1(":"__tests__/tags/child.marko","4?":_.q=new Set,"#text/2!":_.k={},"#text/2(":"section"},2:{"#text/0!":_.d={},"#text/0(":"__tests__/template.marko_1_renderer","#text/1!":_.e={},"#text/1(":"__tests__/template.marko_1_renderer"},3:_.d,4:_.e,5:_.f,6:_.b,7:{"#text/0!":_.g={},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.h={},"#text/1(":"__tests__/template.marko_3_renderer"},8:_.g,9:_.h,10:_.c,11:{"#text/0!":_.i={},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.j={},"#text/1(":"__tests__/template.marko_3_renderer"},12:_.i,13:_.j,14:_.k,15:_.r={}},_.b._=_.c._=_.a,_.a._hoisted_el=_._["__tests__/template.marko_0__hoisted_el/hoist"](_.a),_.a._hoisted_el3=_._["__tests__/template.marko_0__hoisted_el3/hoist"](_.a),_.b._hoisted_el2=_._["__tests__/template.marko_2__hoisted_el2/hoist"](_.b),_.c._hoisted_el2=_._["__tests__/template.marko_2__hoisted_el2/hoist"](_.c),(_.m).add(_.d),(_.m).add(_.e),(_.n).add(_.g),(_.n).add(_.h),(_.o).add(_.b),(_.p).add(_.i),(_.p).add(_.j),(_.o).add(_.c),(_.q).add(_.r),_.l),6,"__tests__/template.marko_2__hoisted_el2",10,"__tests__/template.marko_2__hoisted_el2",1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_el3",1,"__tests__/template.marko_0__hoisted_el",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/ssr.expected.md
index 0ca5702f4a..b0cd21f427 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-from-dynamic/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[3--><span></span><!--M_*3 #span/0--><!--M_]2 #text/0--><!--M_[4--><span></span><!--M_*4 #span/0--><!--M_]2 #text/1--><!--M_[5--><!--M_[6--><!--M_[8--><div></div><!--M_*8 #div/0--><!--M_]7 #text/0--><!--M_[9--><div></div><!--M_*9 #div/0--><!--M_]7 #text/1--><!--M_]5 #text/0--><!--M_[10--><!--M_[12--><div></div><!--M_*12 #div/0--><!--M_]11 #text/0--><!--M_[13--><div></div><!--M_*13 #div/0--><!--M_]11 #text/1--><!--M_]5 #text/1--><!--M_]1 #text/1--><section><p></p><!--M_*15 #p/0--></section><!--M_|1 #text/2 14--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.o={1:_.a={"1?":_.p=new Set,"2?":_.r=new Set,"#text/1!":_.c={"#text/0!":_.b={"3?":_.q=new Set},"#text/1!":_.d={"3?":_.s=new Set}},"#text/1(":_._["__tests__/tags/child.marko"],"4?":_.t=new Set,"#text/2!":_.n={},"#text/2(":"section"},2:{"#text/0!":_.f={},"#text/0(":_.e=_._["__tests__/template.marko_1_renderer"](_.a),"#text/1!":_.g={},"#text/1(":_.e},3:_.f,4:_.g,5:_.c,6:_.b,7:{"#text/0!":_.i={},"#text/0(":_.h=_._["__tests__/template.marko_3_renderer"](_.b),"#text/1!":_.j={},"#text/1(":_.h},8:_.i,9:_.j,10:_.d,11:{"#text/0!":_.l={},"#text/0(":_.k=_._["__tests__/template.marko_3_renderer"](_.d),"#text/1!":_.m={},"#text/1(":_.k},12:_.l,13:_.m,14:_.n,15:_.u={}},_.b._=_.d._=_.a,_.a._hoisted_el=_._["__tests__/template.marko_0__hoisted_el/hoist"](_.a),_.a._hoisted_el3=_._["__tests__/template.marko_0__hoisted_el3/hoist"](_.a),_.b._hoisted_el2=_._["__tests__/template.marko_2__hoisted_el2/hoist"](_.b),_.c["#text/0("]=_.c["#text/1("]=_._["__tests__/template.marko_2_renderer"](_.a),_.d._hoisted_el2=_._["__tests__/template.marko_2__hoisted_el2/hoist"](_.d),(_.p).add(_.f),(_.p).add(_.g),(_.q).add(_.i),(_.q).add(_.j),(_.r).add(_.b),(_.s).add(_.l),(_.s).add(_.m),(_.r).add(_.d),(_.t).add(_.u),_.o),6,"__tests__/template.marko_2__hoisted_el2",10,"__tests__/template.marko_2__hoisted_el2",1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_el3",1,"__tests__/template.marko_0__hoisted_el",0];M._.w()</script>
+  <!--M_[3--><span></span><!--M_*3 #span/0--><!--M_]2 #text/0--><!--M_[4--><span></span><!--M_*4 #span/0--><!--M_]2 #text/1--><!--M_[5--><!--M_[6--><!--M_[8--><div></div><!--M_*8 #div/0--><!--M_]7 #text/0--><!--M_[9--><div></div><!--M_*9 #div/0--><!--M_]7 #text/1--><!--M_]5 #text/0--><!--M_[10--><!--M_[12--><div></div><!--M_*12 #div/0--><!--M_]11 #text/0--><!--M_[13--><div></div><!--M_*13 #div/0--><!--M_]11 #text/1--><!--M_]5 #text/1--><!--M_]1 #text/1--><section><p></p><!--M_*15 #p/0--></section><!--M_|1 #text/2 14--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.l={1:_.a={"1?":_.m=new Set,"2?":_.o=new Set,"#text/1!":_.f={"#text/0!":_.b={"3?":_.n=new Set},"#text/0(":"__tests__/template.marko_2_renderer","#text/1!":_.c={"3?":_.p=new Set},"#text/1(":"__tests__/template.marko_2_renderer"},"#text/1(":"__tests__/tags/child.marko","4?":_.q=new Set,"#text/2!":_.k={},"#text/2(":"section"},2:{"#text/0!":_.d={},"#text/0(":"__tests__/template.marko_1_renderer","#text/1!":_.e={},"#text/1(":"__tests__/template.marko_1_renderer"},3:_.d,4:_.e,5:_.f,6:_.b,7:{"#text/0!":_.g={},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.h={},"#text/1(":"__tests__/template.marko_3_renderer"},8:_.g,9:_.h,10:_.c,11:{"#text/0!":_.i={},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.j={},"#text/1(":"__tests__/template.marko_3_renderer"},12:_.i,13:_.j,14:_.k,15:_.r={}},_.b._=_.c._=_.a,_.a._hoisted_el=_._["__tests__/template.marko_0__hoisted_el/hoist"](_.a),_.a._hoisted_el3=_._["__tests__/template.marko_0__hoisted_el3/hoist"](_.a),_.b._hoisted_el2=_._["__tests__/template.marko_2__hoisted_el2/hoist"](_.b),_.c._hoisted_el2=_._["__tests__/template.marko_2__hoisted_el2/hoist"](_.c),(_.m).add(_.d),(_.m).add(_.e),(_.n).add(_.g),(_.n).add(_.h),(_.o).add(_.b),(_.p).add(_.i),(_.p).add(_.j),(_.o).add(_.c),(_.q).add(_.r),_.l),6,"__tests__/template.marko_2__hoisted_el2",10,"__tests__/template.marko_2__hoisted_el2",1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_el3",1,"__tests__/template.marko_0__hoisted_el",0];M._.w()</script>
 ```
 
 # Render End
@@ -44,7 +44,7 @@
     </section>
     <!--M_|1 #text/2 14-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.o={1:_.a={"1?":_.p=new Set,"2?":_.r=new Set,"#text/1!":_.c={"#text/0!":_.b={"3?":_.q=new Set},"#text/1!":_.d={"3?":_.s=new Set}},"#text/1(":_._["__tests__/tags/child.marko"],"4?":_.t=new Set,"#text/2!":_.n={},"#text/2(":"section"},2:{"#text/0!":_.f={},"#text/0(":_.e=_._["__tests__/template.marko_1_renderer"](_.a),"#text/1!":_.g={},"#text/1(":_.e},3:_.f,4:_.g,5:_.c,6:_.b,7:{"#text/0!":_.i={},"#text/0(":_.h=_._["__tests__/template.marko_3_renderer"](_.b),"#text/1!":_.j={},"#text/1(":_.h},8:_.i,9:_.j,10:_.d,11:{"#text/0!":_.l={},"#text/0(":_.k=_._["__tests__/template.marko_3_renderer"](_.d),"#text/1!":_.m={},"#text/1(":_.k},12:_.l,13:_.m,14:_.n,15:_.u={}},_.b._=_.d._=_.a,_.a._hoisted_el=_._["__tests__/template.marko_0__hoisted_el/hoist"](_.a),_.a._hoisted_el3=_._["__tests__/template.marko_0__hoisted_el3/hoist"](_.a),_.b._hoisted_el2=_._["__tests__/template.marko_2__hoisted_el2/hoist"](_.b),_.c["#text/0("]=_.c["#text/1("]=_._["__tests__/template.marko_2_renderer"](_.a),_.d._hoisted_el2=_._["__tests__/template.marko_2__hoisted_el2/hoist"](_.d),(_.p).add(_.f),(_.p).add(_.g),(_.q).add(_.i),(_.q).add(_.j),(_.r).add(_.b),(_.s).add(_.l),(_.s).add(_.m),(_.r).add(_.d),(_.t).add(_.u),_.o),6,"__tests__/template.marko_2__hoisted_el2",10,"__tests__/template.marko_2__hoisted_el2",1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_el3",1,"__tests__/template.marko_0__hoisted_el",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.l={1:_.a={"1?":_.m=new Set,"2?":_.o=new Set,"#text/1!":_.f={"#text/0!":_.b={"3?":_.n=new Set},"#text/0(":"__tests__/template.marko_2_renderer","#text/1!":_.c={"3?":_.p=new Set},"#text/1(":"__tests__/template.marko_2_renderer"},"#text/1(":"__tests__/tags/child.marko","4?":_.q=new Set,"#text/2!":_.k={},"#text/2(":"section"},2:{"#text/0!":_.d={},"#text/0(":"__tests__/template.marko_1_renderer","#text/1!":_.e={},"#text/1(":"__tests__/template.marko_1_renderer"},3:_.d,4:_.e,5:_.f,6:_.b,7:{"#text/0!":_.g={},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.h={},"#text/1(":"__tests__/template.marko_3_renderer"},8:_.g,9:_.h,10:_.c,11:{"#text/0!":_.i={},"#text/0(":"__tests__/template.marko_3_renderer","#text/1!":_.j={},"#text/1(":"__tests__/template.marko_3_renderer"},12:_.i,13:_.j,14:_.k,15:_.r={}},_.b._=_.c._=_.a,_.a._hoisted_el=_._["__tests__/template.marko_0__hoisted_el/hoist"](_.a),_.a._hoisted_el3=_._["__tests__/template.marko_0__hoisted_el3/hoist"](_.a),_.b._hoisted_el2=_._["__tests__/template.marko_2__hoisted_el2/hoist"](_.b),_.c._hoisted_el2=_._["__tests__/template.marko_2__hoisted_el2/hoist"](_.c),(_.m).add(_.d),(_.m).add(_.e),(_.n).add(_.g),(_.n).add(_.h),(_.o).add(_.b),(_.p).add(_.i),(_.p).add(_.j),(_.o).add(_.c),(_.q).add(_.r),_.l),6,"__tests__/template.marko_2__hoisted_el2",10,"__tests__/template.marko_2__hoisted_el2",1,"__tests__/template.marko_0",1,"__tests__/template.marko_0__hoisted_el3",1,"__tests__/template.marko_0__hoisted_el",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-many/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-many/__snapshots__/html.expected/template.js
index 243d720301..cf1a273e75 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-many/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var-many/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const _scope2_ = new Map();
@@ -50,5 +50,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _hoisted_el3: 0
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/html.expected/tags/child.js
index f21dc2c6ef..92840cf10c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/html.expected/tags/child.js
@@ -1,6 +1,6 @@
 let id = 0;
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_input");
   _$.writeScope(_scope0_id, {
@@ -8,5 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/child.marko", 0, {
     input: 0
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/html.expected/template.js
index 84fc2c3df7..d873d6a710 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/hoist-native-tag-var/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _hoisted_el = _$.hoist(_scope0_id, "__tests__/template.marko_0__hoisted_el/hoist");
   let _ifScopeId2, _ifBranch2;
@@ -53,5 +53,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/template.marko", 0, {
     input_show: ["input.show"]
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/html.expected/template.js
index 49d6d93625..23d9c826b4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-counter/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<div><button>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}<!--${_$.escapeXML(count)} + ${_$.escapeXML(count)} = ${_$.escapeXML(count + count)}-->${_$.markResumeNode(_scope0_id, "#comment/2")}</div>`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "2:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/tags/parent-el.js b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/tags/parent-el.js
index a656d8f346..ef13618c60 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/tags/parent-el.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/tags/parent-el.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/parent-el.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const ref = _$.nodeRef();
   const tagName = undefined;
@@ -8,5 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeEffect(_scope0_id, "__tests__/tags/parent-el.marko_0");
   _$.resumeClosestBranch(_scope0_id);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/parent-el.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/template.js
index 9680f930f7..1f165eca1a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _parentEl from "./tags/parent-el.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div>");
   const _childScope = _$.peekNextScope();
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     "#childScope/0": _$.writeExistingScope(_childScope),
     "#childScope/3": _$.writeExistingScope(_childScope2)
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-entity/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/html-entity/__snapshots__/html.expected/template.js
index 22e9a14c3e..3102df3892 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-entity/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-entity/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div>&lt;div&gt;</div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-script/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/html-script/__snapshots__/html.expected/template.js
index 4ad1defc47..a657be40cb 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-script/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-script/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<script type=importmap>
@@ -16,5 +16,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-style/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/html-style/__snapshots__/html.expected/template.js
index 6ceb32a49c..6f3d777208 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-style/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-style/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<style>
@@ -14,5 +14,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/id-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/id-tag/__snapshots__/html.expected/template.js
index 24e9ef95f3..d1cd51557f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/id-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/id-tag/__snapshots__/html.expected/template.js
@@ -1,8 +1,7 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = _$.nextTagId();
   const y = _$.nextTagId();
   _$.write(`<div>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>${_$.escapeXML(y)}${_$.markResumeNode(_scope0_id, "#text/1")}`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/if-default-false/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/if-default-false/__snapshots__/html.expected/template.js
index 440db10bcc..144690406e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/if-default-false/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/if-default-false/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const show = false;
@@ -22,5 +22,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     show: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/if-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/if-tag/__snapshots__/html.expected/template.js
index b61ce44da5..58fb9aaaf9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/if-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/if-tag/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   let _ifScopeId2, _ifBranch2;
@@ -62,5 +62,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     input_x: ["input.x"],
     input_y: ["input.y"]
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-conflict/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-conflict/__snapshots__/html.expected/template.js
index c30a4789bc..166fbc8588 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-conflict/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-conflict/__snapshots__/html.expected/template.js
@@ -1,8 +1,7 @@
 import { asset as asset1 } from "./asset1";
 import { asset as asset2 } from "./asset2";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`${_$.escapeXML(asset1)} ${_$.escapeXML(asset2)}`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/tags/baz.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/tags/baz.js
index 37439c89b2..1592ac5ade 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/tags/baz.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/tags/baz.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/baz.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div></div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/baz.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/template.js
index 918302994f..09986eb1bd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/template.js
@@ -1,8 +1,7 @@
 import BazComp from "./tags/baz.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   BazComp({});
   BazComp({});
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/baz.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/baz.js
index 5fecdabb40..b7165b6956 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/baz.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/baz.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/baz.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div>baz</div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/baz.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/foo.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/foo.js
index f000d2712c..338bff1288 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/foo.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/foo.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/foo.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div>foo</div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/foo.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/template.js
index 071fe282b4..649ee43205 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/template.js
@@ -1,15 +1,14 @@
 import baz from "./tags/baz.marko";
 import foo from "./tags/foo.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", x === 1 ? baz : foo, {});
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(x === 1 ? baz : foo)
+    "#text/0(": _$.dynamicTagId(x === 1 ? baz : foo)
   }, "__tests__/template.marko", 0);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/resume.expected.md
index 19f48d678f..4be98afeed 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
     </div>
     <!--M_]1 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{"#text/0!":_.a={},"#text/0(":_._["__tests__/tags/baz.marko"]},2:_.a}),0]
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{"#text/0!":_.a={},"#text/0(":"__tests__/tags/baz.marko"},2:_.a}),0]
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/ssr.expected.md
index 6769aaf2b0..e3321707c4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[2--><div>baz</div><!--M_]1 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:{"#text/0!":_.a={},"#text/0(":_._["__tests__/tags/baz.marko"]},2:_.a}),0]</script>
+  <!--M_[2--><div>baz</div><!--M_]1 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={1:{"#text/0!":_.a={},"#text/0(":"__tests__/tags/baz.marko"},2:_.a}),0]</script>
 ```
 
 # Render End
@@ -14,7 +14,7 @@
     </div>
     <!--M_]1 #text/0-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{"#text/0!":_.a={},"#text/0(":_._["__tests__/tags/baz.marko"]},2:_.a}),0]
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={1:{"#text/0!":_.a={},"#text/0(":"__tests__/tags/baz.marko"},2:_.a}),0]
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/html.expected/tags/baz.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/html.expected/tags/baz.js
index 37439c89b2..1592ac5ade 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/html.expected/tags/baz.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/html.expected/tags/baz.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/baz.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div></div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/baz.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/html.expected/template.js
index 6ebff1e7b4..a41ccd6846 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/html.expected/template.js
@@ -3,11 +3,10 @@ import { b as c } from "./bar";
 import Baz from "./tags/baz.marko";
 import _baz from "./tags/baz.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   Baz({});
   Baz({});
   _baz({});
   _$.write(_$.escapeXML(c));
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/input-destructure/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/input-destructure/__snapshots__/html.expected/template.js
index dc82f0da46..d50af6dc0c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/input-destructure/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/input-destructure/__snapshots__/html.expected/template.js
@@ -1,10 +1,9 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     a,
     b
   } = input;
   _$.write(`<!>${_$.escapeXML(a)}${_$.markResumeNode(_scope0_id, "#text/0")} <!>${_$.escapeXML(b)}${_$.markResumeNode(_scope0_id, "#text/1")}`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/tags/child.js
index f8252e7b9a..78b67ed9a8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/tags/child.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const state = input.value;
   const otherState = input.value;
@@ -20,5 +20,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     otherState: "6:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/template.js
index 1d44747c51..c037ef7c86 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const source = 1;
   const _childScope = _$.peekNextScope();
@@ -15,5 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     "#childScope/0": _$.writeExistingScope(_childScope)
   }, "__tests__/template.marko", 0);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-dynamic-change-handler/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-dynamic-change-handler/__snapshots__/html.expected/template.js
index 874163df95..26e21d5d25 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-dynamic-change-handler/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-dynamic-change-handler/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const yChange = _$.register(function (newValue) {
@@ -20,5 +20,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     y: "3:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/html.expected/template.js
index 616367a7f7..a9252d6a80 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-id/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const handler = _$.register(function (newValue) {
@@ -19,5 +19,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     y: "3:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/html.expected/template.js
index 01fa343e94..e0e97cf321 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-static/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const y = x;
@@ -14,5 +14,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     y: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/html.expected/template.js
index 6a59b8001a..0685f836d3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-derived/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     a
@@ -13,5 +13,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     b: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/html.expected/template.js
index 8ecb632d90..563da557b0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-set-in-effect/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const y = 0;
@@ -11,5 +11,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     x: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/html.expected/template.js
index 7447c3810e..8b7f6c91b5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-with-intersection/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const y = x + 1;
@@ -13,5 +13,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     x: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag/__snapshots__/html.expected/template.js
index 4e2084a0c6..859886ea00 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const y = 1;
@@ -13,5 +13,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     y: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/html.expected/template.js
index 6183cc66f5..7e8e48aadb 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-undefined-until-dom/__snapshots__/html.expected/template.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = undefined;
   _$.write(`<div>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/html.expected/template.js
index d56c5f9c5e..9e8cc8c660 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-assignment/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 0;
   const prev = false;
@@ -11,5 +11,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     x: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-conditional/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-conditional/__snapshots__/html.expected/template.js
index 408cd5b185..c14773f7a0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-conditional/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-conditional/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const x = 0;
@@ -28,5 +28,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     show: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this-attrs/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this-attrs/__snapshots__/html.expected/template.js
index d8fa4962b0..2062a954e0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this-attrs/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this-attrs/__snapshots__/html.expected/template.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 0;
   _$.write(`<div>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/html.expected/template.js
index 4fe7e1609f..4ec48b96dc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag-this/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 0;
   _$.write(`<div id=ref></div><button id=increment>Increment</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     x: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/html.expected/template.js
index 4fe7e1609f..4ec48b96dc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/lifecycle-tag/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 0;
   _$.write(`<div id=ref></div><button id=increment>Increment</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     x: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/log-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/log-tag/__snapshots__/html.expected/template.js
index 115d775771..259c41f6b2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/log-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/log-tag/__snapshots__/html.expected/template.js
@@ -1,7 +1,7 @@
 import testLog from "./test-log";
 const staticVar = "static var";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   console.log("identifier");
   const tagVar = "tag var";
@@ -11,5 +11,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.write(`<!>${_$.escapeXML(output)}${_$.markResumeNode(_scope0_id, "#text/0")}`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/migrate-effect-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/migrate-effect-tag/__snapshots__/html.expected/template.js
index db93be83c2..733eacd7ea 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/migrate-effect-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/migrate-effect-tag/__snapshots__/html.expected/template.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   _$.write(`<div>${_$.escapeXML(x)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/migrate-input/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/migrate-input/__snapshots__/html.expected/template.js
index 05997a389b..48926e86e1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/migrate-input/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/migrate-input/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div><span>${_$.escapeXML(input.x)}${_$.markResumeNode(_scope0_id, "#text/0")}</span></div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/migrate-out-global/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/migrate-out-global/__snapshots__/html.expected/template.js
index 2277bab337..11c775bac0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/migrate-out-global/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/migrate-out-global/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div><span>${_$.escapeXML(_$.$global().x)}</span></div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/html.expected/template.js
index 39957afc1c..0631d9a212 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/move-and-clear-children/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const {
@@ -19,5 +19,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     "#div/0(": _scope1_.size ? _scope1_ : undefined
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/html.expected/template.js
index cb10cfc8a1..6fb70eaf45 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/move-and-clear-top-level/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const _by = function (c) {
@@ -14,5 +14,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     "#text/0(": _scope1_.size ? _scope1_ : undefined
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/html.expected/tags/2counters.js b/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/html.expected/tags/2counters.js
index b47769f56b..5deb514cf9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/html.expected/tags/2counters.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/html.expected/tags/2counters.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/2counters.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count1 = input.count1;
   const count2 = input.count2;
@@ -24,5 +24,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count2: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/2counters.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/html.expected/template.js
index fba18e8fd6..eba1a2a96a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/multiple-bound-values/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import _counters from "./tags/2counters.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count1 = 0;
   const count2 = 0;
@@ -20,5 +20,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     "#childScope/0": _$.writeExistingScope(_childScope)
   }, "__tests__/template.marko", 0);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/html.expected/template.js
index 368e34ab53..34c82719e1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const Parent = "div";
   const Child = "a";
@@ -8,21 +8,21 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/2", Child, {
     href: "#bar"
-  }, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  }, _$.registerContent("__tests__/template.marko_2_renderer", () => {
     const _scope2_id = _$.nextScopeId();
     _$.write("Hi");
-  }), "__tests__/template.marko_2_renderer", _scope0_id));
+  }, _scope0_id));
   _$.write(`</svg><math>${_$.toString(input.value)}${_$.markResumeNode(_scope0_id, "#text/3")}`);
   const _dynamicScope2 = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/4", Child, {
     href: "#bar"
-  }, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  }, _$.registerContent("__tests__/template.marko_3_renderer", () => {
     const _scope3_id = _$.nextScopeId();
     _$.write("Hi");
-  }), "__tests__/template.marko_3_renderer", _scope0_id));
+  }, _scope0_id));
   _$.write("</math>");
   const _dynamicScope3 = _$.peekNextScope();
-  _$.dynamicTagInput(_scope0_id, "#text/5", Parent, {}, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  _$.dynamicTagInput(_scope0_id, "#text/5", Parent, {}, _$.registerContent("__tests__/template.marko_1_renderer", () => {
     const _scope1_id = _$.nextScopeId();
     _$.write(`${_$.toString(input.value)}${_$.markResumeNode(_scope1_id, "#text/0")}`);
     _$.writeEffect(_scope1_id, "__tests__/template.marko_1_input_value/subscriber");
@@ -30,7 +30,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
       _: _$.ensureScopeWithId(_scope0_id)
     }, "__tests__/template.marko", "12:3");
     _$.resumeClosestBranch(_scope1_id);
-  }), "__tests__/template.marko_1_renderer", _scope0_id));
+  }, _scope0_id));
   _$.write(`<button class=toggle-parent>Toggle Parent</button>${_$.markResumeNode(_scope0_id, "#button/6")}<button class=toggle-child>Toggle Child</button>${_$.markResumeNode(_scope0_id, "#button/7")}</div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0_Parent_Child");
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0_Child");
@@ -40,16 +40,15 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     Parent,
     Child,
     "#text/2!": _$.writeExistingScope(_dynamicScope),
-    "#text/2(": _$.normalizeDynamicRenderer(Child),
+    "#text/2(": _$.dynamicTagId(Child),
     "#text/4!": _$.writeExistingScope(_dynamicScope2),
-    "#text/4(": _$.normalizeDynamicRenderer(Child),
+    "#text/4(": _$.dynamicTagId(Child),
     "#text/5!": _$.writeExistingScope(_dynamicScope3),
-    "#text/5(": _$.normalizeDynamicRenderer(Parent)
+    "#text/5(": _$.dynamicTagId(Parent)
   }, "__tests__/template.marko", 0, {
     input_value: ["input.value"],
     Parent: "1:5",
     Child: "2:5"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-name/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/native-tag-name/__snapshots__/html.expected/template.js
index efd3d55b69..d71554e1ce 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-name/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-name/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<span></span><div></div><div></div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-downstream-effect/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-downstream-effect/__snapshots__/html.expected/template.js
index 0ace7ea4d8..4d6dec75e7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-downstream-effect/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-downstream-effect/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const el = _$.nodeRef();
   _$.write(`<div></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
@@ -11,5 +11,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     }, "__tests__/template.marko", "2:2");
   }
   _$.writeScope(_scope0_id, {}, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/tags/hello-setter.js b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/tags/hello-setter.js
index 5b86de5927..c934a78949 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/tags/hello-setter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/tags/hello-setter.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello-setter.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     el
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/tags/hello-setter.marko", 0, {
     el: "1:10"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello-setter.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/template.js
index c8c94150cb..c7c584331e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _helloSetter from "./tags/hello-setter.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const el = _$.nodeRef(_scope0_id, "__tests__/template.marko_0/#div");
   _$.write(`<div></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
@@ -8,5 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     el: el
   });
   _$.writeScope(_scope0_id, {}, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/html.expected/template.js
index 887c39c938..3f4692187a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect/__snapshots__/html.expected/template.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const el = _$.nodeRef();
   _$.write(`<div></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.writeScope(_scope0_id, {}, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/html.expected/template.js
index 58740c173b..3d9edef7c4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/nested-assignment-expression/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   const lastCount = 0;
@@ -12,5 +12,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/nested-for-if-stateful/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/nested-for-if-stateful/__snapshots__/html.expected/template.js
index e8462a29bb..1c8d7be3ca 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/nested-for-if-stateful/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/nested-for-if-stateful/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const counts = [0, 0, 0];
@@ -48,5 +48,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     counts: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/placeholders/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/placeholders/__snapshots__/html.expected/template.js
index 8a33d4ab29..db6bef0492 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/placeholders/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/placeholders/__snapshots__/html.expected/template.js
@@ -1,10 +1,9 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<!>${_$.escapeXML(input.x)}${_$.markResumeNode(_scope0_id, "#text/0")}<span>${_$.escapeXML(input.x)}${_$.markResumeNode(_scope0_id, "#text/1")}<div></div></span><div><div>a</div>${_$.escapeXML(input.x)}${_$.markResumeNode(_scope0_id, "#text/2")}Hello Text &lt;a/><!>${_$.toString(input.x)}${_$.markResumeNode(_scope0_id, "#text/3")}Hello HTML <span>hi</span><script>
     ${_$.escapeScript("'Hello <b> </script>'")}
   </script>${_$.markResumeNode(_scope0_id, "#script/5")}<style>
     ${_$.escapeStyle(".test { content: 'Hello <b> </style>' }")}
   </style>${_$.markResumeNode(_scope0_id, "#style/6")}</div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/html.expected/template.js
index e63ab00b28..1ce1164293 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/reassignment-expression-counter/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<button id=addTwo>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}<button id=triple>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/3")}</button>${_$.markResumeNode(_scope0_id, "#button/2")}<button id=cube>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/5")}</button>${_$.markResumeNode(_scope0_id, "#button/4")}`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/html.expected/template.js
index 39957afc1c..0631d9a212 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/remove-and-add-rows/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _scope1_ = new Map();
   const {
@@ -19,5 +19,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     "#div/0(": _scope1_.size ? _scope1_ : undefined
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/tags/child.js
index f4da7d9891..4542fa8ca5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/tags/child.js
@@ -1,10 +1,9 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   _$.write("<span>child</span>");
   const _return = x;
   _$.resumeClosestBranch(_scope0_id);
   return _return;
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/template.js
index a57855a2e1..9d65bae6ce 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/template.js
@@ -1,7 +1,6 @@
 import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _child({});
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/html.expected/template.js
index f463deb4a4..a672e52a61 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/html.expected/template.js
@@ -1,8 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const Once = {
-    content: _$.register(/* @__PURE__ */_$.createRenderer(({
+    content: _$.registerContent("__tests__/template.marko_1_renderer", ({
       value
     }) => {
       const _scope1_id = _$.nextScopeId();
@@ -22,7 +22,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
       });
       _$.resumeClosestBranch(_scope1_id);
       return _return;
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    }, _scope0_id)
   };
   const clickOnceCount = 0;
   const _dynamicScope = _$.peekNextScope();
@@ -34,7 +34,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.setTagVar(_scope0_id, "#scopeOffset/1", _dynamicScope, "__tests__/template.marko_0_onClickOnce/var");
   _$.write(`<button class=once>${_$.escapeXML(clickOnceCount)}${_$.markResumeNode(_scope0_id, "#text/3")}</button>${_$.markResumeNode(_scope0_id, "#button/2")}`);
   const Twice = {
-    content: _$.register(/* @__PURE__ */_$.createRenderer(({
+    content: _$.registerContent("__tests__/template.marko_2_renderer", ({
       value
     }) => {
       const _scope2_id = _$.nextScopeId();
@@ -54,7 +54,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
       });
       _$.resumeClosestBranch(_scope2_id);
       return _return2;
-    }), "__tests__/template.marko_2_renderer", _scope0_id)
+    }, _scope0_id)
   };
   const clickTwiceCount = 0;
   const _dynamicScope2 = _$.peekNextScope();
@@ -75,9 +75,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickTwiceCount,
     onClickTwice,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(Once),
+    "#text/0(": _$.dynamicTagId(Once),
     "#text/4!": _$.writeExistingScope(_dynamicScope2),
-    "#text/4(": _$.normalizeDynamicRenderer(Twice)
+    "#text/4(": _$.dynamicTagId(Twice)
   }, "__tests__/template.marko", 0, {
     Once: "1:8",
     clickOnceCount: "9:5",
@@ -87,5 +87,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     onClickTwice: "24:7"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/resume.expected.md
index 842b5f4f1a..6d22dcd51e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/resume.expected.md
@@ -22,7 +22,7 @@
     </button>
     <!--M_*1 #button/6-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/4!":_.e},2:_.c,4:_.e},_.b.content=_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_.a["#text/4("]=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/0(":"__tests__/template.marko_1_renderer","#text/4!":_.e,"#text/4(":"__tests__/template.marko_2_renderer"},2:_.c,4:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
     </script>
   </body>
 </html>
@@ -56,7 +56,7 @@ container.querySelector("button.once").click();
     </button>
     <!--M_*1 #button/6-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/4!":_.e},2:_.c,4:_.e},_.b.content=_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_.a["#text/4("]=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/0(":"__tests__/template.marko_1_renderer","#text/4!":_.e,"#text/4(":"__tests__/template.marko_2_renderer"},2:_.c,4:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
     </script>
   </body>
 </html>
@@ -94,7 +94,7 @@ container.querySelector("button.once").click();
     </button>
     <!--M_*1 #button/6-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/4!":_.e},2:_.c,4:_.e},_.b.content=_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_.a["#text/4("]=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/0(":"__tests__/template.marko_1_renderer","#text/4!":_.e,"#text/4(":"__tests__/template.marko_2_renderer"},2:_.c,4:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
     </script>
   </body>
 </html>
@@ -128,7 +128,7 @@ container.querySelector("button.twice").click();
     </button>
     <!--M_*1 #button/6-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/4!":_.e},2:_.c,4:_.e},_.b.content=_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_.a["#text/4("]=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/0(":"__tests__/template.marko_1_renderer","#text/4!":_.e,"#text/4(":"__tests__/template.marko_2_renderer"},2:_.c,4:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
     </script>
   </body>
 </html>
@@ -166,7 +166,7 @@ container.querySelector("button.twice").click();
     </button>
     <!--M_*1 #button/6-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/4!":_.e},2:_.c,4:_.e},_.b.content=_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_.a["#text/4("]=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/0(":"__tests__/template.marko_1_renderer","#text/4!":_.e,"#text/4(":"__tests__/template.marko_2_renderer"},2:_.c,4:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
     </script>
   </body>
 </html>
@@ -204,7 +204,7 @@ container.querySelector("button.twice").click();
     </button>
     <!--M_*1 #button/6-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/4!":_.e},2:_.c,4:_.e},_.b.content=_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_.a["#text/4("]=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/0(":"__tests__/template.marko_1_renderer","#text/4!":_.e,"#text/4(":"__tests__/template.marko_2_renderer"},2:_.c,4:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/ssr.expected.md
index b479d31378..12963f760f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/returns-within-define-tag/__snapshots__/ssr.expected.md
@@ -1,6 +1,6 @@
 # Write
 ```html
-  <!--M_[2--><!--M_]1 #text/0--><button class=once>0<!--M_*1 #text/3--></button><!--M_*1 #button/2--><!--M_[4--><!--M_]1 #text/4--><button class=twice>0<!--M_*1 #text/7--></button><!--M_*1 #button/6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/4!":_.e},2:_.c,4:_.e},_.b.content=_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_.a["#text/4("]=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()</script>
+  <!--M_[2--><!--M_]1 #text/0--><button class=once>0<!--M_*1 #text/3--></button><!--M_*1 #button/2--><!--M_[4--><!--M_]1 #text/4--><button class=twice>0<!--M_*1 #text/7--></button><!--M_*1 #button/6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/0(":"__tests__/template.marko_1_renderer","#text/4!":_.e,"#text/4(":"__tests__/template.marko_2_renderer"},2:_.c,4:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()</script>
 ```
 
 # Render End
@@ -27,7 +27,7 @@
     </button>
     <!--M_*1 #button/6-->
     <script>
-      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/4!":_.e},2:_.c,4:_.e},_.b.content=_.a["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_.a["#text/4("]=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
+      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={1:_.a={"#scopeOffset/1":3,"#scopeOffset/5":5,Once:_.b={},clickOnceCount:0,onClickOnce:_.c={call:1},Twice:_.d={},clickTwiceCount:0,onClickTwice:_.e={call:2},"#text/0!":_.c,"#text/0(":"__tests__/template.marko_1_renderer","#text/4!":_.e,"#text/4(":"__tests__/template.marko_2_renderer"},2:_.c,4:_.e},_.b.content=_._["__tests__/template.marko_1_renderer"](_.a),_.c.value=_._["__tests__/template.marko_0/onClickOnce"](_.a),_.c["/"]=_._["__tests__/template.marko_0_onClickOnce/var"](_.a),_.a.onClickOnce=_._["__tests__/template.marko_1/_return"](_.c),_.d.content=_._["__tests__/template.marko_2_renderer"](_.a),_.e.value=_._["__tests__/template.marko_0/onClickTwice"](_.a),_.e["/"]=_._["__tests__/template.marko_0_onClickTwice/var"](_.a),_.a.onClickTwice=_._["__tests__/template.marko_2/_return"](_.e),_.f),1,"__tests__/template.marko_0_onClickTwice",1,"__tests__/template.marko_0_onClickOnce",0];M._.w()
     </script>
   </body>
 </html>
diff --git a/packages/runtime-tags/src/__tests__/fixtures/same-source-alias-pattern-and-identifier/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/same-source-alias-pattern-and-identifier/__snapshots__/html.expected/template.js
index 2eec76b6bb..c489ea52f2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/same-source-alias-pattern-and-identifier/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/same-source-alias-pattern-and-identifier/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     a: {
@@ -13,5 +13,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     b: c
   } = a;
   _$.write(`<button>${_$.escapeXML(b)}${_$.markResumeNode(_scope0_id, "#text/0")} <!>${_$.escapeXML(c)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/html.expected/template.js
index d07cac0ff7..f5389445e3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/same-source-non-alias/__snapshots__/html.expected/template.js
@@ -5,7 +5,7 @@ function createWrapper(a) {
 }
 _$.register(createWrapper, "__tests__/template.marko_0/createWrapper");
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   const {
@@ -20,5 +20,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "5:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/script-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/script-tag/__snapshots__/html.expected/template.js
index 15b29592b1..5d29a75260 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/script-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/script-tag/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   _$.write("<div id=ref>0</div>");
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     x: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/serialize-promise/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/serialize-promise/__snapshots__/html.expected/template.js
index f5fb4fedee..c584d971d0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/serialize-promise/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/serialize-promise/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const promise = Promise.resolve("hello");
   _$.write("<div id=ref>0</div>");
@@ -9,5 +9,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/template.marko", 0, {
     promise: "1:8"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/server-client/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/server-client/__snapshots__/html.expected/template.js
index 9cdfbe9eb7..30f284364f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/server-client/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/server-client/__snapshots__/html.expected/template.js
@@ -1,8 +1,7 @@
 const server_x = 1;
 const x = typeof server_x === "undefined" ? client_x : server_x;
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div><span>${_$.escapeXML(x)}</span></div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/html.expected/template.js
index 1af55aac02..59984c5185 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/shadow-same-scope/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   const _count = 0;
@@ -22,5 +22,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     _count3: "14:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/style-tag-modules-default/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/style-tag-modules-default/__snapshots__/html.expected/template.js
index 2a7ee09308..b177e6018b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/style-tag-modules-default/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/style-tag-modules-default/__snapshots__/html.expected/template.js
@@ -1,7 +1,6 @@
 import myStyles from "virtual:./template.marko.module.css \n  .content {\n    color: green;\n  }\n";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div${_$.classAttr(myStyles.content)}>Hello</div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/style-tag-modules-destructured/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/style-tag-modules-destructured/__snapshots__/html.expected/template.js
index b04377b8d8..c6826e76b2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/style-tag-modules-destructured/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/style-tag-modules-destructured/__snapshots__/html.expected/template.js
@@ -1,10 +1,9 @@
 import _style from "virtual:./template.marko.module.css \n  .content {\n    color: green;\n  }\n";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     content
   } = _style;
   _$.write(`<div${_$.classAttr(content)}>Hello</div>`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/style-tag-type/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/style-tag-type/__snapshots__/html.expected/template.js
index 85b056f497..b9762792cc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/style-tag-type/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/style-tag-type/__snapshots__/html.expected/template.js
@@ -1,7 +1,6 @@
 import "virtual:./template.marko.less \n  .content {\n    color: green;\n  }\n";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div class=content>Hello</div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/style-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/style-tag/__snapshots__/html.expected/template.js
index 3ea2f60ea1..d32199c204 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/style-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/style-tag/__snapshots__/html.expected/template.js
@@ -1,7 +1,6 @@
 import "virtual:./template.marko.css \n  .content {\n    color: green;\n  }\n";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div class=content>Hello</div>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/Bar.js b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/Bar.js
index 62977d6960..efb36bdf08 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/Bar.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/Bar.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/Bar.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<span></span>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/Bar.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/foo.js b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/foo.js
index 2014111c4b..24e7ea61df 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/foo.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/foo.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/foo.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<span></span>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/foo.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/template.js
index dc8e335e67..6396f2b767 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/template.js
@@ -3,7 +3,7 @@ const foo = "div";
 const Bar = "div";
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _foo from "./tags/foo.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<div></div>");
   _foo({});
@@ -11,7 +11,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.dynamicTagInput(_scope0_id, "#text/1", Bar, {});
   _$.writeScope(_scope0_id, {
     "#text/1!": _$.writeExistingScope(_dynamicScope),
-    "#text/1(": _$.normalizeDynamicRenderer(Bar)
+    "#text/1(": _$.dynamicTagId(Bar)
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/html.expected/template.js
index 979039f2c9..c16551fe91 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-var-destructure/__snapshots__/html.expected/template.js
@@ -1,7 +1,7 @@
 function noop(_) {}
 _$.register(noop, "__tests__/template.marko_0/noop");
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const a = 0;
   const b = 0;
@@ -11,5 +11,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.write(`<button><pre>a    1    <!>${_$.escapeXML(a)}${_$.markResumeNode(_scope0_id, "#text/1")}</pre><pre>b    2    <!>${_$.escapeXML(b)}${_$.markResumeNode(_scope0_id, "#text/2")}</pre><pre>c  {c:4}  <!>${_$.escapeXML(JSON.stringify(c))}${_$.markResumeNode(_scope0_id, "#text/3")}</pre><pre>d    7    <!>${_$.escapeXML(d)}${_$.markResumeNode(_scope0_id, "#text/4")}</pre><pre>f   [9]   <!>${_$.escapeXML(JSON.stringify(e))}${_$.markResumeNode(_scope0_id, "#text/5")}</pre></button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
   _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/text-content-counter/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/text-content-counter/__snapshots__/html.expected/template.js
index 289e359bc0..6d017b05de 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/text-content-counter/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/text-content-counter/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   _$.write(`<div><button id=button>0</button>${_$.markResumeNode(_scope0_id, "#button/0")}</div>`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "2:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/html.expected/template.js
index cafa6cae97..75893cd5b7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-first-child/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const {
@@ -25,5 +25,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/template.marko", 0, {
     value: "1:10"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/html.expected/template.js
index 250aba8d58..b634192ff0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-2/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId2, _ifBranch2;
   const outer = true;
@@ -48,5 +48,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "3:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-3/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-3/__snapshots__/html.expected/template.js
index 1488a6f410..cccccef3ff 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-3/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested-3/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId2, _ifBranch2;
   const outer = true;
@@ -48,5 +48,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "3:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/html.expected/template.js
index 9aa6aa71c7..2fec6d4559 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-nested/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId3, _ifBranch3;
   const {
@@ -58,5 +58,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     value1: "1:15",
     value2: "1:23"
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child/__snapshots__/html.expected/template.js
index f483e1ded5..668d28e6a8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-only-child/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   _$.write("<div>");
@@ -22,5 +22,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   }, "__tests__/template.marko", 0, {
     input_value: ["input.value"]
   });
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/html.expected/tags/counter.js b/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/html.expected/tags/counter.js
index aa48e4200c..eb389fe45a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/html.expected/tags/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/html.expected/tags/counter.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const clickCount = 0;
   _$.write(`<button>${_$.escapeXML(((() => {
@@ -14,5 +14,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     clickCount: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/html.expected/template.js
index 1b9ca18a57..c5fbca5672 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/toggle-stateful-component/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _counter from "./tags/counter.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   let _ifScopeId, _ifBranch;
   const show = true;
@@ -30,5 +30,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     onCount: "2:8"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/try-single-throw-sync/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/try-single-throw-sync/__snapshots__/html.expected/template.js
index fe21673009..821b93aee2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/try-single-throw-sync/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/try-single-throw-sync/__snapshots__/html.expected/template.js
@@ -1,21 +1,20 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("Before");
   _$.tryContent({
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: _$.registerContent("__tests__/template.marko_2_renderer", () => {
       const _scope2_id = _$.nextScopeId();
       _$.write(`Inside${_$.escapeXML((() => {
         throw new Error("ERROR!");
       })())}`);
-    }), "__tests__/template.marko_2_renderer", _scope0_id),
+    }, _scope0_id),
     catch: _$.attrTag({
-      content: _$.register(/* @__PURE__ */_$.createRenderer(err => {
+      content: _$.registerContent("__tests__/template.marko_1_renderer", err => {
         const _scope1_id = _$.nextScopeId();
         _$.write(`${_$.escapeXML(err.message)}${_$.markResumeNode(_scope1_id, "#text/0")}`);
-      }), "__tests__/template.marko_1_renderer", _scope0_id)
+      }, _scope0_id)
     })
   });
   _$.write("After");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/unserializable-warning/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/unserializable-warning/__snapshots__/html.expected/template.js
index a4dd8bd444..0c4e8032f8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/unserializable-warning/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/unserializable-warning/__snapshots__/html.expected/template.js
@@ -1,8 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const Foo = {
-    content: _$.register(/* @__PURE__ */_$.createRenderer(() => {
+    content: /* @__PURE__ */_$.createContent("__tests__/template.marko_1_renderer", () => {
       const _scope1_id = _$.nextScopeId();
       const unserializable = {
         nested: {
@@ -20,13 +20,12 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
         unserializable: "2:10",
         test: "7:10"
       });
-    }), "__tests__/template.marko_1_renderer", _scope0_id)
+    })
   };
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", Foo, {});
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(Foo)
+    "#text/0(": _$.dynamicTagId(Foo)
   }, "__tests__/template.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/update-attr/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/update-attr/__snapshots__/html.expected/template.js
index c3c98f313e..421d520550 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/update-attr/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/update-attr/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`<div a=0${_$.attr("b", input.value)}></div>${_$.markResumeNode(_scope0_id, "#div/0")}`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/html.expected/template.js
index ad4413f376..b86aae81d7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/update-dynamic-attrs/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const a = 0;
   _$.write(`<div${_$.attrs(input.value, "#div/0", _scope0_id, "div")}></div>${_$.markResumeNode(_scope0_id, "#div/0")}<div${_$.attrs({
@@ -18,5 +18,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     a: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/update-html/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/update-html/__snapshots__/html.expected/template.js
index ec1a816fab..0ef8df761a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/update-html/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/update-html/__snapshots__/html.expected/template.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     value
   } = input;
   _$.write(`<em>Testing</em> <!>${_$.toString(value)}${_$.markResumeNode(_scope0_id, "#text/0")}`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/update-text/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/update-text/__snapshots__/html.expected/template.js
index 2850779063..a49bdd9bb1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/update-text/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/update-text/__snapshots__/html.expected/template.js
@@ -1,9 +1,8 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const {
     value
   } = input;
   _$.write(`Static <!>${_$.escapeXML(value)}${_$.markResumeNode(_scope0_id, "#text/0")}`);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/html.expected/template.js
index ed174f18ab..fb65d3f784 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/user-effect-abort-signal/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const a = 0;
   const b = 0;
@@ -11,5 +11,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     input_value: ["input.value"]
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/tags/child.js b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/tags/child.js
index 2d8eb86834..adbc9ffa40 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/tags/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/tags/child.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<span>Hello</span>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/template.js
index bf8bfe390a..2fc5f52688 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/template.js
@@ -1,11 +1,10 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _child from "./tags/child.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write("<section>");
   _child({});
   _$.write(`</section><div>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</div>`);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/runtime-tags/src/common/helpers.ts b/packages/runtime-tags/src/common/helpers.ts
index 98a89861a0..3091432cb2 100644
--- a/packages/runtime-tags/src/common/helpers.ts
+++ b/packages/runtime-tags/src/common/helpers.ts
@@ -81,5 +81,5 @@ export function alphaEncode(num: number): string {
 export function normalizeDynamicRenderer<Renderer>(
   value: any,
 ): Renderer | string | undefined {
-  if (value) return value.content || value.default || value;
+  return value ? value.content || value.default || value : undefined;
 }
diff --git a/packages/runtime-tags/src/dom/control-flow.ts b/packages/runtime-tags/src/dom/control-flow.ts
index 9b3cc99a95..d71fe6a750 100644
--- a/packages/runtime-tags/src/dom/control-flow.ts
+++ b/packages/runtime-tags/src/dom/control-flow.ts
@@ -52,10 +52,12 @@ export let dynamicTag = function dynamicTag(
   return (scope, newRenderer, getInput?: () => any) => {
     const normalizedRenderer = normalizeDynamicRenderer<Renderer>(newRenderer);
     if (
-      !(rendererAccessor in scope) ||
-      isDifferentRenderer(scope[rendererAccessor], normalizedRenderer)
+      scope[rendererAccessor] !==
+        (scope[rendererAccessor] =
+          (normalizedRenderer as Renderer | undefined)?.___id ||
+          normalizedRenderer) ||
+      (getContent && !(normalizedRenderer || scope[childScopeAccessor]))
     ) {
-      scope[rendererAccessor] = normalizedRenderer;
       setConditionalRenderer(
         scope,
         nodeAccessor,
@@ -260,13 +262,3 @@ function bySecondArg(_item: unknown, index: unknown) {
 function byFirstArg(name: unknown) {
   return name;
 }
-
-function isDifferentRenderer(
-  a: Renderer | string | undefined,
-  b: Renderer | string | undefined,
-) {
-  return (
-    a !== b ||
-    (a as Renderer | undefined)?.___id !== (b as Renderer | undefined)?.___id
-  );
-}
diff --git a/packages/runtime-tags/src/html.ts b/packages/runtime-tags/src/html.ts
index 88d2a3eac3..8d0789461e 100644
--- a/packages/runtime-tags/src/html.ts
+++ b/packages/runtime-tags/src/html.ts
@@ -1,5 +1,4 @@
 export { attrTag, attrTags } from "./common/attr-tag";
-export { normalizeDynamicRenderer } from "./common/helpers";
 export {
   attr,
   attrs,
@@ -17,9 +16,11 @@ export {
 export { compat } from "./html/compat";
 export { escapeScript, escapeStyle, escapeXML, toString } from "./html/content";
 export {
-  createRenderer,
+  createContent,
   dynamicTagArgs,
+  dynamicTagId,
   dynamicTagInput,
+  registerContent,
 } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forTo, forToBy } from "./html/for";
 export { createTemplate } from "./html/template";
diff --git a/packages/runtime-tags/src/html/compat.ts b/packages/runtime-tags/src/html/compat.ts
index 2e34e61d88..14a0e8a474 100644
--- a/packages/runtime-tags/src/html/compat.ts
+++ b/packages/runtime-tags/src/html/compat.ts
@@ -35,6 +35,9 @@ export const compat = {
   write,
   writeScript,
   nextScopeId,
+  isTagsAPI(fn: any) {
+    return !!fn.___id;
+  },
   patchDynamicTag,
   writeSetScopeForComponent(m5c: string) {
     const scopeId = nextScopeId();
diff --git a/packages/runtime-tags/src/html/dynamic-tag.ts b/packages/runtime-tags/src/html/dynamic-tag.ts
index 863b0643bb..12ca11484f 100644
--- a/packages/runtime-tags/src/html/dynamic-tag.ts
+++ b/packages/runtime-tags/src/html/dynamic-tag.ts
@@ -1,5 +1,5 @@
+import { normalizeDynamicRenderer } from "../common/helpers";
 import type { Accessor } from "../common/types";
-import { normalizeDynamicRenderer } from "../html";
 import {
   attrs,
   controllable_select_value,
@@ -8,6 +8,7 @@ import {
 import type { ServerRenderer } from "./template";
 import {
   nextScopeId,
+  register,
   resumeConditional,
   resumeSingleNodeConditional,
   write,
@@ -20,6 +21,14 @@ interface BodyContentObject {
   content: ServerRenderer;
 }
 
+export function dynamicTagId(tagName: unknown) {
+  const normalizedRenderer = normalizeDynamicRenderer<ServerRenderer>(tagName);
+  return (
+    (normalizedRenderer as ServerRenderer | undefined)?.___id ||
+    normalizedRenderer
+  );
+}
+
 // TODO: refactor dynamicTagInput and dynamicTagArgs to be the same impl with a flag for input vs args.
 export function dynamicTagInput(
   scopeId: number,
@@ -155,13 +164,22 @@ export function dynamicTagArgs(
   return result;
 }
 
-let getDynamicRenderer = normalizeDynamicRenderer<ServerRenderer>;
-export let createRenderer = (fn: ServerRenderer) => fn;
+export function createContent(id: string, fn: ServerRenderer) {
+  fn.___id = id;
+  return fn;
+}
 
+export function registerContent(
+  id: string,
+  fn: ServerRenderer,
+  scopeId?: number,
+) {
+  return register(createContent(id, fn), id, scopeId);
+}
+
+let getDynamicRenderer = normalizeDynamicRenderer<ServerRenderer>;
 export function patchDynamicTag(
   newGetDynamicRenderer: typeof getDynamicRenderer,
-  newCreateRenderer: typeof createRenderer,
 ) {
   getDynamicRenderer = newGetDynamicRenderer;
-  createRenderer = newCreateRenderer;
 }
diff --git a/packages/runtime-tags/src/html/template.ts b/packages/runtime-tags/src/html/template.ts
index 4e9d451a3b..19b7e7fabe 100644
--- a/packages/runtime-tags/src/html/template.ts
+++ b/packages/runtime-tags/src/html/template.ts
@@ -1,5 +1,6 @@
 import { DEFAULT_RENDER_ID, DEFAULT_RUNTIME_ID } from "../common/meta";
 import type { RenderResult, Template, TemplateInput } from "../common/types";
+import { registerContent } from "./dynamic-tag";
 import {
   Boundary,
   Chunk,
@@ -7,11 +8,12 @@ import {
   offTick,
   prepareChunk,
   queueTick,
-  register,
   State,
 } from "./writer";
 
-export type ServerRenderer = (...args: unknown[]) => unknown;
+export type ServerRenderer = ((...args: unknown[]) => unknown) & {
+  ___id?: string;
+};
 
 export const createTemplate = (
   templateId: string,
@@ -28,7 +30,7 @@ export const createTemplate = (
     };
   }
 
-  return register(renderer as unknown as Template, templateId);
+  return registerContent(templateId, renderer) as unknown as Template;
 };
 
 function render(this: Template & ServerRenderer, input: TemplateInput = {}) {
diff --git a/packages/runtime-tags/src/translator/core/define.ts b/packages/runtime-tags/src/translator/core/define.ts
index 092da21831..a4bfc3b411 100644
--- a/packages/runtime-tags/src/translator/core/define.ts
+++ b/packages/runtime-tags/src/translator/core/define.ts
@@ -32,8 +32,18 @@ export default {
     }
 
     const tagBody = tag.get("body");
-    startSection(tagBody);
+    const bodySection = startSection(tagBody);
     trackVarReferences(tag, BindingType.derived);
+
+    if (bodySection) {
+      const varBinding = tag.node.var?.extra?.binding;
+      if (varBinding) {
+        // TODO: need to do this for attr tags.
+        // Should probably allow passing a binding to analyzeAttrTags.
+        bodySection.downstreamBinding =
+          varBinding.propertyAliases.get("content") || varBinding;
+      }
+    }
     // TODO: should determine if var bindings are nullable based on attrs.
     trackParamsReferences(tagBody, BindingType.param);
     analyzeAttributeTags(tag);
diff --git a/packages/runtime-tags/src/translator/util/references.ts b/packages/runtime-tags/src/translator/util/references.ts
index 7c81c98f24..fe67907989 100644
--- a/packages/runtime-tags/src/translator/util/references.ts
+++ b/packages/runtime-tags/src/translator/util/references.ts
@@ -52,7 +52,7 @@ export type Binding = {
   type: BindingType;
   loc: t.SourceLocation | null;
   section: Section;
-  serialize: boolean | Set<Binding>;
+  serialize: boolean;
   aliases: Set<Binding>;
   hoists: Map<Section, Binding>;
   property: string | undefined;
diff --git a/packages/runtime-tags/src/translator/util/sections.ts b/packages/runtime-tags/src/translator/util/sections.ts
index 6c5b81c3b4..5df16918fd 100644
--- a/packages/runtime-tags/src/translator/util/sections.ts
+++ b/packages/runtime-tags/src/translator/util/sections.ts
@@ -35,6 +35,7 @@ export interface Section {
   isHoistThrough: true | undefined;
   assignments: ReferencedBindings;
   upstreamExpression: t.NodeExtra | undefined;
+  downstreamBinding: Binding | undefined;
   hasAbortSignal: boolean;
   isBranch: boolean;
   content: null | {
@@ -90,6 +91,7 @@ export function startSection(
       assignments: undefined,
       content: getContentInfo(path),
       upstreamExpression: undefined,
+      downstreamBinding: undefined,
       hasAbortSignal: false,
       isBranch: false,
     };
@@ -261,6 +263,10 @@ export function getNodeContentType(
   return ContentType.Dynamic;
 }
 
+export const isSerializedSection = (section: Section) => {
+  return !(section.isBranch || section.downstreamBinding?.serialize === false);
+};
+
 export const isStatefulSection = (section: Section) => {
   const upstreamExpression = section.upstreamExpression;
   return (
diff --git a/packages/runtime-tags/src/translator/util/translate-attrs.ts b/packages/runtime-tags/src/translator/util/translate-attrs.ts
index 83bc8b0f82..0f6929b4ac 100644
--- a/packages/runtime-tags/src/translator/util/translate-attrs.ts
+++ b/packages/runtime-tags/src/translator/util/translate-attrs.ts
@@ -13,7 +13,11 @@ import {
   getAttrTagIdentifier,
 } from "./nested-attribute-tags";
 import { callRuntime } from "./runtime";
-import { getScopeIdIdentifier, getSection } from "./sections";
+import {
+  getScopeIdIdentifier,
+  getSection,
+  isSerializedSection,
+} from "./sections";
 import { getResumeRegisterId } from "./signals";
 import { toObjectProperty } from "./to-property-name";
 
@@ -404,21 +408,23 @@ function buildContent(body: t.NodePath<t.MarkoTagBody>) {
   const bodySection = body.node.extra?.section;
   if (bodySection) {
     if (isOutputHTML()) {
+      const serialized = isSerializedSection(bodySection);
       return callRuntime(
-        "register",
-        callRuntime(
-          "createRenderer",
-          t.arrowFunctionExpression(
-            body.node.params,
-            t.blockStatement(body.node.body),
-          ),
-        ),
+        serialized ? "registerContent" : "createContent",
         t.stringLiteral(getResumeRegisterId(bodySection, "renderer")),
-        getScopeIdIdentifier(
-          getSection(
-            getNonAttributeTagParent(body.parentPath as t.NodePath<t.MarkoTag>),
-          )!,
+        t.arrowFunctionExpression(
+          body.node.params,
+          t.blockStatement(body.node.body),
         ),
+        serialized
+          ? getScopeIdIdentifier(
+              getSection(
+                getNonAttributeTagParent(
+                  body.parentPath as t.NodePath<t.MarkoTag>,
+                ),
+              )!,
+            )
+          : undefined,
       );
     } else {
       return t.callExpression(t.identifier(bodySection.name), [
diff --git a/packages/runtime-tags/src/translator/visitors/program/dom.ts b/packages/runtime-tags/src/translator/visitors/program/dom.ts
index f2b8cd3b3c..2d1437c507 100644
--- a/packages/runtime-tags/src/translator/visitors/program/dom.ts
+++ b/packages/runtime-tags/src/translator/visitors/program/dom.ts
@@ -9,7 +9,7 @@ import {
   forEachSectionReverse,
   getSectionForBody,
   getSectionParentIsOwner,
-  isStatefulSection,
+  isSerializedSection,
 } from "../../util/sections";
 import {
   getResumeRegisterId,
@@ -63,7 +63,7 @@ export default {
                 ]),
               )
             : callRuntime(
-                !childSection.isBranch && isStatefulSection(childSection)
+                isSerializedSection(childSection)
                   ? "registerContent"
                   : "createContent",
                 t.stringLiteral(getResumeRegisterId(childSection, "renderer")),
diff --git a/packages/runtime-tags/src/translator/visitors/program/html.ts b/packages/runtime-tags/src/translator/visitors/program/html.ts
index dbc26b5024..a66cb6b564 100644
--- a/packages/runtime-tags/src/translator/visitors/program/html.ts
+++ b/packages/runtime-tags/src/translator/visitors/program/html.ts
@@ -9,7 +9,23 @@ import { simplifyFunction } from "../../util/simplify-fn";
 import { traverseReplace } from "../../util/traverse";
 import type { TemplateVisitor } from "../../util/visitors";
 import { flushInto } from "../../util/writer";
-import { htmlRendererIdentifier } from ".";
+import { currentProgramPath } from ".";
+
+const templateContentIdentifierForProgram = new WeakMap<
+  t.NodePath<t.Program>,
+  string
+>();
+export function getTemplateContentName() {
+  let name = templateContentIdentifierForProgram.get(currentProgramPath);
+  if (!name) {
+    templateContentIdentifierForProgram.set(
+      currentProgramPath,
+      (name = currentProgramPath.scope.generateUid("content")),
+    );
+  }
+
+  return name;
+}
 
 export default {
   translate: {
@@ -32,28 +48,30 @@ export default {
         }
       }
 
-      program.pushContainer("body", [
-        t.variableDeclaration("const", [
-          t.variableDeclarator(
-            htmlRendererIdentifier,
-            callRuntime(
-              "createRenderer",
-              t.arrowFunctionExpression(
-                [t.identifier("input")],
-                t.blockStatement(renderContent),
-              ),
-            ),
-          ),
-        ]),
-
-        t.exportDefaultDeclaration(
-          callRuntime(
-            "createTemplate",
-            t.stringLiteral(program.hub.file.metadata.marko.id),
-            htmlRendererIdentifier,
-          ),
+      const contentId = templateContentIdentifierForProgram.get(program);
+      const contentFn = t.arrowFunctionExpression(
+        [t.identifier("input")],
+        t.blockStatement(renderContent),
+      );
+      const exportDefault = t.exportDefaultDeclaration(
+        callRuntime(
+          "createTemplate",
+          t.stringLiteral(program.hub.file.metadata.marko.id),
+          contentId ? t.identifier(contentId) : contentFn,
         ),
-      ]);
+      );
+
+      program.pushContainer(
+        "body",
+        contentId
+          ? [
+              t.variableDeclaration("const", [
+                t.variableDeclarator(t.identifier(contentId), contentFn),
+              ]),
+              exportDefault,
+            ]
+          : exportDefault,
+      );
     },
   },
 } satisfies TemplateVisitor<t.Program>;
diff --git a/packages/runtime-tags/src/translator/visitors/program/index.ts b/packages/runtime-tags/src/translator/visitors/program/index.ts
index b545151ae9..929c9e6322 100644
--- a/packages/runtime-tags/src/translator/visitors/program/index.ts
+++ b/packages/runtime-tags/src/translator/visitors/program/index.ts
@@ -26,13 +26,10 @@ import programHTML from "./html";
 
 export let currentProgramPath: t.NodePath<t.Program>;
 export let cleanIdentifier: t.Identifier;
-export let htmlRendererIdentifier: t.Identifier;
-
 export let scopeIdentifier: t.Identifier;
 export function isScopeIdentifier(node: t.Node): node is t.Identifier {
   return node === scopeIdentifier;
 }
-
 const previousProgramPath: WeakMap<
   t.NodePath<t.Program>,
   t.NodePath<t.Program> | undefined
@@ -40,6 +37,7 @@ const previousProgramPath: WeakMap<
 
 export type TemplateExport = {
   id: string;
+  binding: Binding;
   props: { [prop: string]: TemplateExport } | undefined;
 };
 export type TemplateExports = TemplateExport["props"];
@@ -113,9 +111,6 @@ export default {
       cleanIdentifier = isOutputDOM()
         ? program.scope.generateUidIdentifier("clean")
         : (null as any as t.Identifier);
-      htmlRendererIdentifier = isOutputHTML()
-        ? program.scope.generateUidIdentifier("renderer")
-        : (null as any as t.Identifier);
       if (getMarkoOpts().output === "hydrate") {
         const entryFile = program.hub.file;
         const visitedFiles = new Set([
@@ -186,6 +181,7 @@ function resolveRelativeToEntry(
 function buildTemplateExports(binding: Binding, scope: t.Scope) {
   const templateExport: TemplateExport = {
     id: (binding.export ??= scope.generateUid(binding.name + "_")),
+    binding,
     props: undefined,
   };
   const { aliases, propertyAliases, downstreamExpressions } = binding;
diff --git a/packages/runtime-tags/src/translator/visitors/tag/custom-tag.ts b/packages/runtime-tags/src/translator/visitors/tag/custom-tag.ts
index 31a52ccaa9..fc17c47bea 100644
--- a/packages/runtime-tags/src/translator/visitors/tag/custom-tag.ts
+++ b/packages/runtime-tags/src/translator/visitors/tag/custom-tag.ts
@@ -37,6 +37,7 @@ import {
   getOrCreateSection,
   getScopeIdIdentifier,
   getSection,
+  getSectionForBody,
   type Section,
   startSection,
 } from "../../util/sections";
@@ -65,10 +66,10 @@ import * as walks from "../../util/walks";
 import * as writer from "../../util/writer";
 import {
   currentProgramPath,
-  htmlRendererIdentifier,
   scopeIdentifier,
   type TemplateExport,
 } from "../program";
+import { getTemplateContentName } from "../program/html";
 
 type AttrTagGroup = AttrTagLookup[string]["group"];
 const kChildScopeBinding = Symbol("custom tag child scope");
@@ -180,7 +181,7 @@ function translateHTML(tag: t.NodePath<t.MarkoTag>) {
   if (t.isStringLiteral(node.name)) {
     const relativePath = getTagRelativePath(tag);
     tagIdentifier = isCircularRequest(tag.hub.file, relativePath)
-      ? htmlRendererIdentifier
+      ? t.identifier(getTemplateContentName())
       : importDefault(tag.hub.file, relativePath, getTagName(tag));
   } else {
     tagIdentifier = node.name;
@@ -424,6 +425,13 @@ function analyzeAttrs(
     return;
   }
 
+  const bodySection = getSectionForBody(tag.get("body"));
+  if (bodySection) {
+    bodySection.downstreamBinding = (
+      templateExport.props.content || templateExport.props
+    ).binding;
+  }
+
   const attrTagLookup = analyzeAttributeTags(tag);
   const seen = new Set<string>();
   if (attrTagLookup) {
diff --git a/packages/runtime-tags/src/translator/visitors/tag/dynamic-tag.ts b/packages/runtime-tags/src/translator/visitors/tag/dynamic-tag.ts
index 7c6b2285ee..10a5d5597a 100644
--- a/packages/runtime-tags/src/translator/visitors/tag/dynamic-tag.ts
+++ b/packages/runtime-tags/src/translator/visitors/tag/dynamic-tag.ts
@@ -264,7 +264,7 @@ export default {
           section,
           getScopeAccessor(nodeRef) + AccessorChar.ConditionalRenderer,
           callRuntime(
-            "normalizeDynamicRenderer",
+            "dynamicTagId",
             t.isIdentifier(tagExpression)
               ? t.identifier(tagExpression.name)
               : tagExpression,
diff --git a/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/html.expected/tags/hello.js b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/html.expected/tags/hello.js
index 7936552f18..063a0c3ca3 100644
--- a/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/html.expected/tags/hello.js
+++ b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/html.expected/tags/hello.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<h1>Hello world</h1>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/components/custom-tag.js b/packages/translator-interop/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/components/custom-tag.js
index 98e0249970..da5c4853f5 100644
--- a/packages/translator-interop/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/components/custom-tag.js
+++ b/packages/translator-interop/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/components/custom-tag.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const x = 1;
   const y = 10;
@@ -12,12 +12,11 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     x,
     y,
     "#text/3!": _$.writeExistingScope(_dynamicScope),
-    "#text/3(": _$.normalizeDynamicRenderer(input.content)
+    "#text/3(": _$.dynamicTagId(input.content)
   }, "__tests__/components/custom-tag.marko", 0, {
     input_content: ["input.content"],
     x: "1:6",
     y: "2:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/explicit/__snapshots__/html.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/explicit/__snapshots__/html.expected/template.js
index a0598015f4..c46291eba3 100644
--- a/packages/translator-interop/src/__tests__/fixtures/explicit/__snapshots__/html.expected/template.js
+++ b/packages/translator-interop/src/__tests__/fixtures/explicit/__snapshots__/html.expected/template.js
@@ -1,6 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   _$.write("<h1>Hello world</h1>");
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/__snapshots__/html.expected/components/tags-counter.js b/packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/__snapshots__/html.expected/components/tags-counter.js
index 65d3bbb1a7..ba85528b79 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/__snapshots__/html.expected/components/tags-counter.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-basic-class-to-tags/__snapshots__/html.expected/components/tags-counter.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/components/tags-counter.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<button id=tags${_$.attr("data-parent", input.count)}>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/tags-counter.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/__snapshots__/html.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/__snapshots__/html.expected/template.js
index c47475f261..ecb9e0f6af 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/__snapshots__/html.expected/template.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-basic-tags-to-class/__snapshots__/html.expected/template.js
@@ -1,7 +1,7 @@
 import { s as _s } from "marko/src/runtime/helpers/tags-compat/html-debug.mjs";
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _classCounter from "./components/class-counter.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<button id=tags>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -14,10 +14,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     count,
     "#text/2!": _$.writeExistingScope(_dynamicScope),
-    "#text/2(": _$.normalizeDynamicRenderer(_classCounter)
+    "#text/2(": _$.dynamicTagId(_classCounter)
   }, "__tests__/template.marko", 0, {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/tags/hello.js b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/tags/hello.js
index 269c07c5a5..cc01c4710b 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/tags/hello.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/tags/hello.js
@@ -1,14 +1,13 @@
 import { s as _s } from "marko/src/runtime/helpers/tags-compat/html-debug.mjs";
 import _helloInternal from "./components/hello-internal.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_scope0_id, "#text/0", _helloInternal, {});
   _s(_helloInternal, "__tests__/tags/components/hello-internal.marko");
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(_helloInternal)
+    "#text/0(": _$.dynamicTagId(_helloInternal)
   }, "__tests__/tags/hello.marko", 0);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-to-tags-import/__snapshots__/html.expected/components/tags-counter.js b/packages/translator-interop/src/__tests__/fixtures/interop-class-to-tags-import/__snapshots__/html.expected/components/tags-counter.js
index 65d3bbb1a7..ba85528b79 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-class-to-tags-import/__snapshots__/html.expected/components/tags-counter.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-to-tags-import/__snapshots__/html.expected/components/tags-counter.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/components/tags-counter.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<button id=tags${_$.attr("data-parent", input.count)}>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/tags-counter.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/__snapshots__/html.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/__snapshots__/html.expected/template.js
index eef1816f69..40b70a169f 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/__snapshots__/html.expected/template.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-events-tags-to-class/__snapshots__/html.expected/template.js
@@ -1,7 +1,7 @@
 import { s as _s } from "marko/src/runtime/helpers/tags-compat/html-debug.mjs";
 import _classCounter from "./components/class-counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   const _dynamicScope = _$.peekNextScope();
@@ -14,8 +14,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.write(`<div id=tags-api>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</div>`);
   _$.writeScope(_scope0_id, {
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(_classCounter)
+    "#text/0(": _$.dynamicTagId(_classCounter)
   }, "__tests__/template.marko", 0);
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-nested-attr-tags-class-to-tags/__snapshots__/html.expected/components/tags-layout.js b/packages/translator-interop/src/__tests__/fixtures/interop-nested-attr-tags-class-to-tags/__snapshots__/html.expected/components/tags-layout.js
index f47bb4a6c0..dc64b6a568 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-nested-attr-tags-class-to-tags/__snapshots__/html.expected/components/tags-layout.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-nested-attr-tags-class-to-tags/__snapshots__/html.expected/components/tags-layout.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/components/tags-layout.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<button id=tags>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}<div>`);
@@ -10,10 +10,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     count,
     "#text/2!": _$.writeExistingScope(_dynamicScope),
-    "#text/2(": _$.normalizeDynamicRenderer(input.stuff.content)
+    "#text/2(": _$.dynamicTagId(input.stuff.content)
   }, "__tests__/components/tags-layout.marko", 0, {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/tags-layout.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/__snapshots__/html.expected/components/tags-layout.js b/packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/__snapshots__/html.expected/components/tags-layout.js
index cdf62f3e52..4f5df14966 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/__snapshots__/html.expected/components/tags-layout.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-nested-class-to-tags/__snapshots__/html.expected/components/tags-layout.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/components/tags-layout.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<button id=tags>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}<div>`);
@@ -10,10 +10,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
   _$.writeScope(_scope0_id, {
     count,
     "#text/2!": _$.writeExistingScope(_dynamicScope),
-    "#text/2(": _$.normalizeDynamicRenderer(input.content)
+    "#text/2(": _$.dynamicTagId(input.content)
   }, "__tests__/components/tags-layout.marko", 0, {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/tags-layout.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/html.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/html.expected/template.js
index f6420b5c92..df266d824d 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/html.expected/template.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-nested-tags-to-class/__snapshots__/html.expected/template.js
@@ -1,11 +1,11 @@
 import { s as _s } from "marko/src/runtime/helpers/tags-compat/html-debug.mjs";
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _classLayout from "./components/class-layout.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   const _dynamicScope = _$.peekNextScope();
-  _$.dynamicTagInput(_scope0_id, "#text/0", _classLayout, {}, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+  _$.dynamicTagInput(_scope0_id, "#text/0", _classLayout, {}, _$.registerContent("__tests__/template.marko_1_renderer", () => {
     const _scope1_id = _$.nextScopeId();
     _$.write(`<button id=tags>${_$.escapeXML(count)}${_$.markResumeNode(_scope1_id, "#text/1")}</button>${_$.markResumeNode(_scope1_id, "#button/0")}`);
     _$.writeEffect(_scope1_id, "__tests__/template.marko_1_count/subscriber");
@@ -14,15 +14,14 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
       _: _$.ensureScopeWithId(_scope0_id)
     }, "__tests__/template.marko", "2:2");
     _$.resumeClosestBranch(_scope1_id);
-  }), "__tests__/template.marko_1_renderer", _scope0_id));
+  }, _scope0_id));
   _s(_classLayout, "__tests__/components/class-layout.marko");
   _$.writeScope(_scope0_id, {
     count,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(_classLayout)
+    "#text/0(": _$.dynamicTagId(_classLayout)
   }, "__tests__/template.marko", 0, {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/__snapshots__/html.expected/components/tags-layout.js b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/__snapshots__/html.expected/components/tags-layout.js
index fa59c7a55d..c63165f0c4 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/__snapshots__/html.expected/components/tags-layout.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-class-to-tags/__snapshots__/html.expected/components/tags-layout.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/components/tags-layout.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<button id=tags>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}<div>`);
@@ -11,11 +11,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     input_content: input.content,
     count,
     "#text/2!": _$.writeExistingScope(_dynamicScope),
-    "#text/2(": _$.normalizeDynamicRenderer(input.content)
+    "#text/2(": _$.dynamicTagId(input.content)
   }, "__tests__/components/tags-layout.marko", 0, {
     input_content: ["input.content"],
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/tags-layout.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/html.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/html.expected/template.js
index 082a5fe476..952363c4b7 100644
--- a/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/html.expected/template.js
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-tag-params-tags-to-class/__snapshots__/html.expected/template.js
@@ -1,11 +1,11 @@
 import { s as _s } from "marko/src/runtime/helpers/tags-compat/html-debug.mjs";
 import * as _$ from "@marko/runtime-tags/debug/html";
 import _classLayout from "./components/class-layout.marko";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const multiplier = 1;
   const _dynamicScope = _$.peekNextScope();
-  _$.dynamicTagInput(_scope0_id, "#text/0", _classLayout, {}, _$.register(/* @__PURE__ */_$.createRenderer((baseCount, message) => {
+  _$.dynamicTagInput(_scope0_id, "#text/0", _classLayout, {}, _$.registerContent("__tests__/template.marko_1_renderer", (baseCount, message) => {
     const _scope1_id = _$.nextScopeId();
     _$.write(`<h1>${_$.escapeXML(message)}${_$.markResumeNode(_scope1_id, "#text/0")}</h1><button id=tags>${_$.escapeXML(multiplier)}${_$.markResumeNode(_scope1_id, "#text/2")} * <!>${_$.escapeXML(baseCount)}${_$.markResumeNode(_scope1_id, "#text/3")} = <!>${_$.escapeXML(multiplier * baseCount)}${_$.markResumeNode(_scope1_id, "#text/4")}</button>${_$.markResumeNode(_scope1_id, "#button/1")}`);
     _$.writeEffect(_scope1_id, "__tests__/template.marko_1_multiplier/subscriber");
@@ -17,15 +17,14 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
       baseCount: "2:15"
     });
     _$.resumeClosestBranch(_scope1_id);
-  }), "__tests__/template.marko_1_renderer", _scope0_id));
+  }, _scope0_id));
   _s(_classLayout, "__tests__/components/class-layout.marko");
   _$.writeScope(_scope0_id, {
     multiplier,
     "#text/0!": _$.writeExistingScope(_dynamicScope),
-    "#text/0(": _$.normalizeDynamicRenderer(_classLayout)
+    "#text/0(": _$.dynamicTagId(_classLayout)
   }, "__tests__/template.marko", 0, {
     multiplier: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/let/__snapshots__/html.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/let/__snapshots__/html.expected/template.js
index 0a670a951d..6350f10d90 100644
--- a/packages/translator-interop/src/__tests__/fixtures/let/__snapshots__/html.expected/template.js
+++ b/packages/translator-interop/src/__tests__/fixtures/let/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-const _renderer = /* @__PURE__ */_$.createRenderer(input => {
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", input => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`<button>${_$.escapeXML(count)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
@@ -10,5 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer(input => {
     count: "1:6"
   });
   _$.resumeClosestBranch(_scope0_id);
-});
-export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
+});
\ No newline at end of file