From 4b3da75480109fb8bf6562584252bedd97a9ca06 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sun, 15 Apr 2018 22:15:08 -0400
Subject: [PATCH] remove v1 runtime tests

---
 test/runtime/index.js                         | 20 +++----
 test/runtime/samples/action-this/main.html    |  2 +-
 .../samples/action-update/main-v2.html        | 52 -------------------
 test/runtime/samples/action-update/main.html  |  4 +-
 .../samples/attribute-boolean-false/main.html |  2 +-
 .../attribute-boolean-indeterminate/main.html |  2 +-
 .../samples/attribute-boolean-true/main.html  |  2 +-
 .../attribute-dynamic-multiple/main.html      |  6 +--
 .../attribute-dynamic-quotemarks/main.html    |  2 +-
 .../attribute-dynamic-reserved/main.html      |  2 +-
 .../attribute-dynamic-shorthand/main-v2.html  |  9 ----
 .../attribute-dynamic-shorthand/main.html     |  2 +-
 .../samples/attribute-dynamic-type/main.html  |  2 +-
 .../samples/attribute-dynamic/main.html       |  2 +-
 .../samples/attribute-namespaced/main.html    |  2 +-
 .../attribute-partial-number/Component.html   |  2 +-
 .../attribute-prefer-expression/main.html     |  4 +-
 test/runtime/samples/autofocus/main.html      |  4 +-
 .../samples/await-component-oncreate/Foo.html |  4 +-
 .../await-component-oncreate/main.html        |  6 +--
 .../samples/await-set-simultaneous/main.html  | 14 ++---
 .../samples/await-then-catch-anchor/main.html | 12 ++---
 .../samples/await-then-catch-event/main.html  | 10 ++--
 .../samples/await-then-catch-if/main.html     | 18 +++----
 .../await-then-catch-in-slot/main.html        | 12 ++---
 .../await-then-catch-multiple/main.html       | 24 ++++-----
 .../await-then-catch-non-promise/main.html    | 12 ++---
 .../samples/await-then-catch/main.html        | 12 ++---
 .../samples/await-then-shorthand/main.html    | 10 ++--
 .../binding-indirect-computed/main.html       | 10 ++--
 .../samples/binding-indirect/main.html        | 14 ++---
 .../main.html                                 | 10 ++--
 .../main.html                                 |  8 +--
 .../binding-input-checkbox-group/main.html    |  8 +--
 .../main.html                                 |  4 +-
 .../samples/binding-input-checkbox/main.html  |  2 +-
 .../samples/binding-input-number/main.html    |  2 +-
 .../binding-input-radio-group/main.html       |  8 +--
 .../binding-input-range-change/main.html      |  2 +-
 .../samples/binding-input-range/main.html     |  2 +-
 .../binding-input-text-contextual/main.html   |  6 +--
 .../binding-input-text-deconflicted/main.html |  2 +-
 .../main.html                                 |  2 +-
 .../main.html                                 |  2 +-
 .../main.html                                 |  6 +--
 .../main.html                                 |  6 +--
 .../samples/binding-input-text-deep/main.html |  2 +-
 .../samples/binding-input-text/main.html      |  2 +-
 .../main.html                                 |  8 +--
 .../binding-select-in-each-block/main.html    |  4 +-
 .../binding-select-in-yield/Modal.html        |  4 +-
 .../samples/binding-select-in-yield/main.html |  8 +--
 .../main.html                                 |  4 +-
 .../binding-select-initial-value/main.html    |  4 +-
 .../samples/binding-select-late/main.html     |  8 +--
 .../samples/binding-select-multiple/main.html |  2 +-
 .../samples/binding-select-optgroup/main.html |  2 +-
 test/runtime/samples/binding-select/main.html |  4 +-
 .../samples/binding-textarea/main.html        |  2 +-
 .../samples/bindings-before-oncreate/Two.html |  2 +-
 .../samples/bindings-coalesced/Foo.html       |  4 +-
 .../samples/bindings-coalesced/main.html      |  2 +-
 .../component-binding-blowback-b/main.html    | 10 ++--
 .../component-binding-blowback-c/Nested.html  |  2 +-
 .../component-binding-blowback-c/main.html    | 10 ++--
 .../component-binding-blowback/main.html      |  4 +-
 .../component-binding-computed/Nested.html    |  2 +-
 .../component-binding-computed/main.html      |  6 +--
 .../component-binding-conditional-b/Bar.html  |  2 +-
 .../component-binding-conditional-b/Foo.html  |  2 +-
 .../component-binding-conditional-b/main.html |  8 +--
 .../component-binding-conditional/Bar.html    |  2 +-
 .../component-binding-conditional/Foo.html    |  2 +-
 .../component-binding-conditional/main.html   |  8 +--
 .../ComponentSelector.html                    |  6 +--
 .../component-binding-deep-b/main.html        |  4 +-
 .../samples/component-binding-deep/main.html  |  2 +-
 .../component-binding-each-nested/main.html   |  6 +--
 .../component-binding-each-object/Widget.html |  2 +-
 .../component-binding-each-object/main.html   |  4 +-
 .../samples/component-binding-each/main.html  |  6 +--
 .../component-binding-infinite-loop/B.html    |  8 +--
 .../component-binding-infinite-loop/C.html    |  6 +--
 .../samples/component-binding-nested/Bar.html |  2 +-
 .../samples/component-binding-nested/Baz.html |  2 +-
 .../samples/component-binding-nested/Foo.html |  2 +-
 .../component-binding-nested/main.html        |  2 +-
 .../main.html                                 |  2 +-
 .../main.html                                 |  6 +--
 .../samples/component-binding/main.html       |  2 +-
 .../component-data-dynamic-late/Widget.html   |  2 +-
 .../component-data-dynamic-late/main.html     |  6 +--
 .../Widget.html                               |  2 +-
 .../main.html                                 |  2 +-
 .../component-data-dynamic/Widget.html        |  8 +--
 .../samples/component-data-dynamic/main.html  |  2 +-
 .../samples/component-data-empty/Widget.html  |  2 +-
 .../Link.html                                 |  2 +-
 .../component-data-static-boolean/Foo.html    |  2 +-
 .../samples/component-data-static/Widget.html |  4 +-
 .../samples/component-data-static/main.html   |  2 +-
 .../samples/component-events-each/main.html   |  4 +-
 .../samples/component-events/main.html        |  4 +-
 .../component-if-placement/Component.html     |  4 +-
 .../samples/component-if-placement/main.html  |  6 +--
 .../component-name-deconflicted/Nested.html   |  2 +-
 .../component-name-deconflicted/main.html     | 10 ++--
 .../samples/component-nested-deep/Level2.html |  2 +-
 .../component-nested-deeper/Level1.html       |  8 +--
 .../component-nested-deeper/Level2.html       | 10 ++--
 .../component-nested-deeper/Level3.html       |  2 +-
 .../samples/component-nested-deeper/main.html |  2 +-
 .../samples/component-not-void/Link.html      |  2 +-
 .../component-slot-dynamic/Nested.html        |  2 +-
 .../component-slot-each-block/main.html       |  6 +--
 .../main.html                                 |  4 +-
 .../samples/component-slot-if-block/main.html |  4 +-
 .../main.html                                 |  6 +--
 .../component-static-at-symbol/Email.html     |  2 +-
 .../component-yield-follows-element/Foo.html  |  2 +-
 .../samples/component-yield-if/Widget.html    |  6 +--
 .../samples/component-yield-if/main.html      |  2 +-
 .../Widget.html                               |  2 +-
 .../main.html                                 |  6 +--
 .../Widget.html                               |  2 +-
 .../component-yield-multiple-in-if/main.html  |  6 +--
 .../component-yield-nested-if/Outer.html      |  6 +--
 .../component-yield-nested-if/main.html       |  2 +-
 .../component-yield-parent/Widget.html        |  2 +-
 .../samples/component-yield-parent/main.html  |  2 +-
 .../component-yield-placement/Modal.html      |  2 +-
 .../component-yield-placement/main.html       |  6 +--
 .../component-yield-static/Widget.html        |  2 +-
 .../samples/component-yield-static/main.html  |  2 +-
 .../runtime/samples/component-yield/main.html |  6 +--
 .../samples/computed-function/main-v2.html    | 20 -------
 .../samples/computed-function/main.html       |  4 +-
 .../computed-values-deconflicted/main-v2.html | 14 -----
 .../computed-values-deconflicted/main.html    |  4 +-
 .../computed-values-default/main-v2.html      |  9 ----
 .../samples/computed-values-default/main.html |  4 +-
 .../main-v2.html                              | 28 ----------
 .../main.html                                 |  6 +--
 .../samples/computed-values/main-v2.html      | 16 ------
 .../runtime/samples/computed-values/main.html |  8 +--
 test/runtime/samples/custom-method/main.html  |  2 +-
 .../samples/deconflict-builtins/main.html     |  2 +-
 .../deconflict-component-refs/main.html       | 12 ++---
 .../samples/deconflict-contexts/main.html     |  6 +--
 .../deconflict-elements-indexes/main.html     |  6 +--
 .../samples/deconflict-non-helpers/main.html  |  4 +-
 .../samples/deconflict-template-1/main.html   |  2 +-
 .../samples/deconflict-template-2/main.html   |  2 +-
 .../runtime/samples/deconflict-vars/main.html |  2 +-
 .../samples/default-data-function/main.html   |  2 +-
 .../samples/default-data-override/main.html   |  2 +-
 test/runtime/samples/default-data/main.html   |  2 +-
 .../main-v2.html                              | 13 -----
 .../main.html                                 |  2 +-
 .../samples/dev-warning-helper/main.html      |  2 +-
 .../dev-warning-missing-data/main.html        |  4 +-
 .../dev-warning-readonly-computed/main.html   |  2 +-
 .../main-v2.html                              |  1 -
 .../main.html                                 |  2 +-
 .../Green-v2.html                             |  1 -
 .../Green.html                                |  2 +-
 .../Red-v2.html                               |  1 -
 .../Red.html                                  |  2 +-
 .../main-v2.html                              | 15 ------
 .../main.html                                 |  2 +-
 .../dynamic-component-bindings/main-v2.html   | 12 -----
 .../dynamic-component-bindings/main.html      |  2 +-
 .../dynamic-component-events/main-v2.html     | 12 -----
 .../dynamic-component-events/main.html        |  2 +-
 .../Bar-v2.html                               |  1 -
 .../dynamic-component-inside-element/Bar.html |  2 +-
 .../Foo-v2.html                               |  1 -
 .../dynamic-component-inside-element/Foo.html |  2 +-
 .../main-v2.html                              | 14 -----
 .../main.html                                 |  2 +-
 .../dynamic-component-ref/main-v2.html        | 11 ----
 .../samples/dynamic-component-ref/main.html   |  2 +-
 .../dynamic-component-slot/main-v2.html       | 45 ----------------
 .../samples/dynamic-component-slot/main.html  | 20 +++----
 .../Bar-v2.html                               |  1 -
 .../Bar.html                                  |  2 +-
 .../Foo-v2.html                               |  1 -
 .../Foo.html                                  |  2 +-
 .../main-v2.html                              | 12 -----
 .../main.html                                 |  2 +-
 .../samples/dynamic-component/Bar.html        |  2 +-
 .../samples/dynamic-component/Foo.html        |  2 +-
 .../samples/dynamic-component/main.html       |  2 +-
 .../each-block-array-literal/main.html        |  6 +--
 .../Nested.html                               | 10 ++--
 .../main.html                                 |  2 +-
 .../each-block-containing-if/main.html        | 10 ++--
 .../main.html                                 |  4 +-
 .../each-block-destructured-array/main.html   |  6 +--
 .../each-block-dynamic-else-static/main.html  |  8 +--
 .../each-block-else-starts-empty/main.html    | 10 ++--
 .../runtime/samples/each-block-else/main.html | 10 ++--
 .../samples/each-block-indexed/main.html      |  6 +--
 .../each-block-keyed-dynamic/main.html        |  6 +--
 .../samples/each-block-keyed-empty/main.html  |  2 +-
 .../each-block-keyed-random-permute/main.html |  6 +--
 .../each-block-keyed-siblings/main.html       | 12 ++---
 .../samples/each-block-keyed-static/main.html |  4 +-
 .../each-block-keyed-unshift/Nested.html      |  2 +-
 .../each-block-keyed-unshift/main.html        |  6 +--
 .../samples/each-block-keyed/main-v2.html     |  3 --
 .../samples/each-block-keyed/main.html        |  6 +--
 .../each-block-random-permute/main.html       |  6 +--
 .../samples/each-block-static/main.html       |  4 +-
 .../samples/each-block-text-node/main.html    |  6 +--
 test/runtime/samples/each-block/main.html     |  6 +--
 .../samples/each-blocks-expression/main.html  |  6 +--
 .../samples/each-blocks-nested-b/main.html    | 10 ++--
 .../samples/each-blocks-nested/main.html      | 10 ++--
 .../escape-template-literals/Widget.html      |  2 +-
 .../escape-template-literals/main.html        |  6 +--
 .../event-handler-custom-context/main.html    |  2 +-
 .../main.html                                 | 10 ++--
 .../event-handler-custom-each/main.html       | 10 ++--
 .../main.html                                 |  2 +-
 .../samples/event-handler-custom/main.html    |  2 +-
 .../event-handler-each-deconflicted/main.html | 10 ++--
 .../samples/event-handler-each/main.html      |  8 +--
 .../samples/event-handler-hoisted/main.html   |  4 +-
 .../samples/event-handler-removal/main.html   |  4 +-
 .../samples/event-handler-sanitize/main.html  |  4 +-
 test/runtime/samples/event-handler/main.html  |  4 +-
 .../samples/flush-before-bindings/Nested.html |  8 +--
 .../flush-before-bindings/Visibility.html     |  2 +-
 .../samples/function-in-expression/main.html  |  2 +-
 test/runtime/samples/get-state/main.html      |  2 +-
 .../globals-accessible-directly/main.html     |  2 +-
 .../globals-not-dereferenced/main.html        |  2 +-
 .../main.html                                 |  6 +--
 .../globals-shadowed-by-data/main.html        |  2 +-
 .../globals-shadowed-by-helpers/main.html     |  2 +-
 .../samples/head-title-dynamic/main-v2.html   |  4 --
 .../samples/head-title-dynamic/main.html      |  6 +--
 .../samples/head-title-static/main-v2.html    |  4 --
 .../samples/head-title-static/main.html       |  4 +-
 test/runtime/samples/hello-world/main.html    |  2 +-
 .../helpers-not-call-expression/main.html     |  2 +-
 test/runtime/samples/helpers/main.html        |  2 +-
 .../samples/if-block-else-in-each/main.html   | 10 ++--
 test/runtime/samples/if-block-else/main.html  | 12 ++---
 .../samples/if-block-elseif-text/main.html    |  2 +-
 .../runtime/samples/if-block-elseif/main.html |  8 +--
 .../samples/if-block-expression/main.html     |  4 +-
 test/runtime/samples/if-block-or/main.html    |  4 +-
 .../runtime/samples/if-block-widget/main.html |  4 +-
 test/runtime/samples/if-block/main.html       |  4 +-
 .../samples/if-in-keyed-each/main.html        | 10 ++--
 .../main.html                                 |  4 +-
 .../ignore-unchanged-attribute/main.html      |  4 +-
 .../samples/ignore-unchanged-raw/main.html    |  4 +-
 .../samples/ignore-unchanged-tag/main.html    |  4 +-
 .../samples/immutable-mutable/Nested.html     |  2 +-
 .../samples/immutable-nested/Nested.html      |  2 +-
 test/runtime/samples/immutable-root/main.html |  2 +-
 .../samples/initial-state-assign/main.html    |  4 +-
 .../samples/inline-expressions/main.html      |  2 +-
 .../names-deconflicted-nested/main.html       | 10 ++--
 .../samples/names-deconflicted/Widget.html    |  2 +-
 .../samples/names-deconflicted/main.html      |  6 +--
 .../non-root-style-interpolation/_config.js   | 52 -------------------
 .../non-root-style-interpolation/main.html    | 43 ---------------
 .../main.html                                 |  4 +-
 .../main.html                                 |  2 +-
 .../samples/observe-deferred/main.html        |  2 +-
 .../oncreate-sibling-order/Nested.html        |  2 +-
 .../ondestroy-before-cleanup/main.html        |  4 +-
 test/runtime/samples/onrender-chain/Item.html |  2 +-
 test/runtime/samples/onrender-chain/List.html |  6 +--
 .../ParentWidget.html                         |  2 +-
 .../Widget.html                               |  2 +-
 .../onrender-fires-when-ready/Widget.html     |  2 +-
 .../onrender-fires-when-ready/main.html       |  4 +-
 test/runtime/samples/onstate-event/main.html  |  4 +-
 test/runtime/samples/onstate/main.html        |  4 +-
 test/runtime/samples/onupdate/main.html       |  2 +-
 .../samples/option-without-select/main.html   |  2 +-
 test/runtime/samples/options/main.html        |  2 +-
 .../paren-wrapped-expressions/main.html       | 14 ++---
 .../samples/raw-anchor-first-child/main.html  |  2 +-
 .../raw-anchor-first-last-child/main.html     |  2 +-
 .../samples/raw-anchor-last-child/main.html   |  2 +-
 .../main.html                                 |  2 +-
 .../samples/raw-anchor-next-sibling/main.html |  2 +-
 .../raw-anchor-previous-sibling/main.html     |  2 +-
 .../samples/raw-mustaches-preserved/main.html |  2 +-
 test/runtime/samples/raw-mustaches/main.html  |  2 +-
 test/runtime/samples/refs-unset/main.html     |  6 +--
 .../script-style-non-top-level/main-v2.html   |  4 --
 .../samples/select-bind-array/main.html       |  6 +--
 .../samples/select-bind-in-array/main.html    |  4 +-
 .../samples/select-change-handler/main.html   |  6 +--
 .../select-one-way-bind-object/main.html      |  6 +--
 .../samples/select-one-way-bind/main.html     |  2 +-
 test/runtime/samples/select-props/main.html   |  4 +-
 test/runtime/samples/select/main.html         |  2 +-
 .../samples/self-reference-tree/main-v2.html  | 11 ----
 .../samples/self-reference-tree/main.html     | 14 ++---
 .../samples/self-reference/main-v2.html       |  4 --
 test/runtime/samples/self-reference/main.html |  8 +--
 .../samples/set-after-destroy/main.html       |  2 +-
 .../samples/set-clones-input/main.html        |  2 +-
 .../runtime/samples/set-in-oncreate/main.html |  2 +-
 .../Widget.html                               |  2 +-
 .../set-in-onstate-dedupes-renders/main.html  |  2 +-
 test/runtime/samples/set-in-onstate/main.html |  4 +-
 .../samples/set-mutated-data/main.html        |  2 +-
 .../samples/set-prevents-loop/main.html       |  6 +--
 .../sigil-component-attribute/Widget.html     |  2 +-
 .../sigil-component-attribute/main.html       |  2 +-
 .../samples/spread-component-dynamic/Foo.html |  2 +-
 .../spread-component-dynamic/main.html        |  2 +-
 .../samples/spread-component/Widget.html      |  8 +--
 .../samples/spread-component/main.html        |  2 +-
 .../samples/spread-element-boolean/main.html  |  2 +-
 .../samples/spread-element-multiple/main.html |  2 +-
 test/runtime/samples/spread-element/main.html |  2 +-
 .../samples/state-deconflicted/main.html      |  8 +--
 test/runtime/samples/store-binding/main.html  |  2 +-
 .../store-component-binding-deep/main.html    |  2 +-
 .../store-component-binding-each/main.html    |  6 +--
 .../samples/store-component-binding/main.html |  2 +-
 test/runtime/samples/store-computed/Todo.html |  8 +--
 test/runtime/samples/store-computed/main.html |  6 +--
 test/runtime/samples/store-event/main.html    |  2 +-
 test/runtime/samples/store-nested/Nested.html |  2 +-
 .../samples/store-onstate-dollar/main.html    |  2 +-
 test/runtime/samples/store-root/Nested.html   |  2 +-
 test/runtime/samples/store-root/main.html     |  2 +-
 test/runtime/samples/store/main.html          |  2 +-
 .../Rect.html                                 |  2 +-
 .../main.html                                 |  2 +-
 .../Rect.html                                 |  2 +-
 .../main.html                                 |  2 +-
 .../Rect.html                                 |  2 +-
 .../main.html                                 |  2 +-
 .../samples/svg-each-block-anchor/main.html   |  8 +--
 .../svg-each-block-namespace/main.html        |  6 +--
 test/runtime/samples/svg-multiple/main.html   |  4 +-
 test/runtime/samples/svg-with-style/main.html |  2 +-
 test/runtime/samples/svg-xmlns/main.html      |  2 +-
 test/runtime/samples/svg/main.html            |  2 +-
 .../samples/textarea-children/main.html       |  2 +-
 test/runtime/samples/textarea-value/main.html |  2 +-
 .../samples/transition-css-delay/main.html    |  4 +-
 .../samples/transition-css-duration/main.html |  4 +-
 .../transition-js-delay-in-out/main.html      |  4 +-
 .../samples/transition-js-delay/main.html     |  4 +-
 .../main.html                                 |  6 +--
 .../main.html                                 | 10 ++--
 .../transition-js-each-block-intro/main.html  |  6 +--
 .../main.html                                 |  6 +--
 .../main.html                                 |  6 +--
 .../main.html                                 |  6 +--
 .../transition-js-each-block-outro/main.html  |  6 +--
 .../samples/transition-js-events/main.html    | 10 ++--
 .../transition-js-if-block-bidi/main.html     |  4 +-
 .../main.html                                 | 22 ++++----
 .../main.html                                 | 22 ++++----
 .../main.html                                 | 10 ++--
 .../main.html                                 |  4 +-
 .../transition-js-if-block-intro/main.html    |  4 +-
 .../main.html                                 | 10 ++--
 .../main.html                                 |  6 +--
 .../main.html                                 |  6 +--
 .../main.html                                 |  6 +--
 .../transition-js-nested-intro/main.html      |  4 +-
 .../main.html                                 |  4 +-
 .../transition-js-parameterised/main.html     |  4 +-
 .../samples/whitespace-each-block/main.html   |  2 +-
 .../samples/whitespace-normal/main.html       |  6 +--
 .../window-bind-scroll-update/main-v2.html    |  3 --
 .../window-bind-scroll-update/main.html       |  2 +-
 .../window-binding-resize/main-v2.html        |  3 --
 .../samples/window-binding-resize/main.html   |  4 +-
 .../samples/window-event-context/main-v2.html |  3 --
 .../samples/window-event-context/main.html    |  4 +-
 .../samples/window-event-custom/main-v2.html  | 25 ---------
 .../samples/window-event-custom/main.html     |  4 +-
 test/runtime/samples/window-event/main.html   |  4 +-
 389 files changed, 809 insertions(+), 1261 deletions(-)
 delete mode 100644 test/runtime/samples/action-update/main-v2.html
 delete mode 100644 test/runtime/samples/attribute-dynamic-shorthand/main-v2.html
 delete mode 100644 test/runtime/samples/computed-function/main-v2.html
 delete mode 100644 test/runtime/samples/computed-values-deconflicted/main-v2.html
 delete mode 100644 test/runtime/samples/computed-values-default/main-v2.html
 delete mode 100644 test/runtime/samples/computed-values-function-dependency/main-v2.html
 delete mode 100644 test/runtime/samples/computed-values/main-v2.html
 delete mode 100644 test/runtime/samples/dev-warning-dynamic-components-misplaced/main-v2.html
 delete mode 100644 test/runtime/samples/dev-warning-readonly-window-binding/main-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-bindings-recreated/Green-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-bindings-recreated/Red-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-bindings-recreated/main-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-bindings/main-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-events/main-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-inside-element/Bar-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-inside-element/Foo-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-inside-element/main-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-ref/main-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-slot/main-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-update-existing-instance/Bar-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-update-existing-instance/Foo-v2.html
 delete mode 100644 test/runtime/samples/dynamic-component-update-existing-instance/main-v2.html
 delete mode 100644 test/runtime/samples/each-block-keyed/main-v2.html
 delete mode 100644 test/runtime/samples/head-title-dynamic/main-v2.html
 delete mode 100644 test/runtime/samples/head-title-static/main-v2.html
 delete mode 100644 test/runtime/samples/non-root-style-interpolation/_config.js
 delete mode 100644 test/runtime/samples/non-root-style-interpolation/main.html
 delete mode 100644 test/runtime/samples/script-style-non-top-level/main-v2.html
 delete mode 100644 test/runtime/samples/self-reference-tree/main-v2.html
 delete mode 100644 test/runtime/samples/self-reference/main-v2.html
 delete mode 100644 test/runtime/samples/window-bind-scroll-update/main-v2.html
 delete mode 100644 test/runtime/samples/window-binding-resize/main-v2.html
 delete mode 100644 test/runtime/samples/window-event-context/main-v2.html
 delete mode 100644 test/runtime/samples/window-event-custom/main-v2.html

diff --git a/test/runtime/index.js b/test/runtime/index.js
index 96d7ad6445..913fddacf2 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -21,11 +21,11 @@ let compileOptions = null;
 let compile = null;
 
 function getName(filename) {
-	const base = path.basename(filename).replace('-v2', '').replace(".html", "");
+	const base = path.basename(filename).replace(".html", "");
 	return base[0].toUpperCase() + base.slice(1);
 }
 
-describe("runtime", () => {
+describe.only("runtime", () => {
 	before(() => {
 		svelte = loadSvelte(false);
 		svelte$ = loadSvelte(true);
@@ -46,7 +46,7 @@ describe("runtime", () => {
 
 	const failed = new Set();
 
-	function runTest(dir, shared, hydrate, v2) {
+	function runTest(dir, shared, hydrate) {
 		if (dir[0] === ".") return;
 
 		const config = loadConfig(`./runtime/samples/${dir}/_config.js`);
@@ -55,7 +55,7 @@ describe("runtime", () => {
 			throw new Error("Forgot to remove `solo: true` from test");
 		}
 
-		(config.skip ? it.skip : config.solo ? it.only : it)(`${dir} (${shared ? 'shared' : 'inline'} helpers${hydrate ? ', hydration' : ''}${v2 ? ', v2' : ''})`, () => {
+		(config.skip ? it.skip : config.solo ? it.only : it)(`${dir} (${shared ? 'shared' : 'inline'} helpers${hydrate ? ', hydration' : ''})`, () => {
 			if (failed.has(dir)) {
 				// this makes debugging easier, by only printing compiled output once
 				throw new Error('skipping test, already failed');
@@ -72,7 +72,7 @@ describe("runtime", () => {
 			compileOptions.dev = config.dev;
 			compileOptions.store = !!config.store;
 			compileOptions.immutable = config.immutable;
-			compileOptions.parser = v2 ? 'v2' : 'v1';
+			compileOptions.parser = 'v2'; // TODO remove
 
 			Object.keys(require.cache)
 				.filter(x => x.endsWith(".html"))
@@ -112,7 +112,7 @@ describe("runtime", () => {
 					};
 
 					try {
-						SvelteComponent = require(`./samples/${dir}/main${v2 ? '-v2' : ''}.html`);
+						SvelteComponent = require(`./samples/${dir}/main.html`);
 					} catch (err) {
 						showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store }, compile); // eslint-disable-line no-console
 						throw err;
@@ -172,12 +172,12 @@ describe("runtime", () => {
 						config.error(assert, err);
 					} else {
 						failed.add(dir);
-						showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store, v2 }, compile); // eslint-disable-line no-console
+						showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store, v2: true }, compile); // eslint-disable-line no-console
 						throw err;
 					}
 				})
 				.then(() => {
-					if (config.show) showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store, v2 }, compile);
+					if (config.show) showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store, v2: true }, compile);
 				});
 		});
 	}
@@ -187,10 +187,6 @@ describe("runtime", () => {
 		runTest(dir, shared, false);
 		runTest(dir, shared, true);
 		runTest(dir, null, false);
-
-		if (fs.existsSync(`test/runtime/samples/${dir}/main-v2.html`)) {
-			runTest(dir, shared, false, true);
-		}
 	});
 
 	it("fails if options.target is missing in dev mode", () => {
diff --git a/test/runtime/samples/action-this/main.html b/test/runtime/samples/action-this/main.html
index 95da3d4a8c..6eb12e1206 100644
--- a/test/runtime/samples/action-this/main.html
+++ b/test/runtime/samples/action-this/main.html
@@ -1,4 +1,4 @@
-<button use:foo>{{x}}</button>
+<button use:foo>{x}</button>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/action-update/main-v2.html b/test/runtime/samples/action-update/main-v2.html
deleted file mode 100644
index 6b319f5dca..0000000000
--- a/test/runtime/samples/action-update/main-v2.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<button use:tooltip="tooltip">action</button>
-<svelte:window on:keydown="checkForCtrl(event)" on:keyup="checkForCtrl(event)"/>
-
-<script>
-	export default {
-		data() {
-			return { tooltip: 'Perform an Action' };
-		},
-
-		methods: {
-			checkForCtrl(event) {
-				if (event.ctrlKey) {
-					this.set({ tooltip: 'Perform an augmented Action' });
-				} else {
-					this.set({ tooltip: 'Perform an Action' });
-				}
-			}
-		},
-
-		actions: {
-			tooltip(node, text) {
-				let tooltip = null;
-
-				function onMouseEnter() {
-					tooltip = document.createElement('div');
-					tooltip.classList.add('tooltip');
-					tooltip.textContent = text;
-					node.parentNode.appendChild(tooltip);
-				}
-
-				function onMouseLeave() {
-					if (!tooltip) return;
-					tooltip.remove();
-					tooltip = null;
-				}
-
-				node.addEventListener('mouseenter', onMouseEnter);
-				node.addEventListener('mouseleave', onMouseLeave);
-
-				return {
-					update(text) {
-						if (tooltip) tooltip.textContent = text;
-					},
-					destroy() {
-						node.removeEventListener('mouseenter', onMouseEnter);
-						node.removeEventListener('mouseleave', onMouseLeave);
-					}
-				}
-			}
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/action-update/main.html b/test/runtime/samples/action-update/main.html
index 03bd0d0ef9..6b319f5dca 100644
--- a/test/runtime/samples/action-update/main.html
+++ b/test/runtime/samples/action-update/main.html
@@ -1,5 +1,5 @@
 <button use:tooltip="tooltip">action</button>
-<:Window on:keydown="checkForCtrl(event)" on:keyup="checkForCtrl(event)"/>
+<svelte:window on:keydown="checkForCtrl(event)" on:keyup="checkForCtrl(event)"/>
 
 <script>
 	export default {
@@ -36,7 +36,7 @@
 
 				node.addEventListener('mouseenter', onMouseEnter);
 				node.addEventListener('mouseleave', onMouseLeave);
-				
+
 				return {
 					update(text) {
 						if (tooltip) tooltip.textContent = text;
diff --git a/test/runtime/samples/attribute-boolean-false/main.html b/test/runtime/samples/attribute-boolean-false/main.html
index 29b8b87d80..ad3e510c72 100644
--- a/test/runtime/samples/attribute-boolean-false/main.html
+++ b/test/runtime/samples/attribute-boolean-false/main.html
@@ -1 +1 @@
-<textarea readonly="{{false}}"></textarea>
+<textarea readonly="{false}"></textarea>
diff --git a/test/runtime/samples/attribute-boolean-indeterminate/main.html b/test/runtime/samples/attribute-boolean-indeterminate/main.html
index e7ab75dcc1..ad065fbd13 100644
--- a/test/runtime/samples/attribute-boolean-indeterminate/main.html
+++ b/test/runtime/samples/attribute-boolean-indeterminate/main.html
@@ -1 +1 @@
-<input type='checkbox' indeterminate='{{indeterminate}}'>
\ No newline at end of file
+<input type='checkbox' indeterminate='{indeterminate}'>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-boolean-true/main.html b/test/runtime/samples/attribute-boolean-true/main.html
index 0630681a4b..fe4d7c4327 100644
--- a/test/runtime/samples/attribute-boolean-true/main.html
+++ b/test/runtime/samples/attribute-boolean-true/main.html
@@ -1 +1 @@
-<textarea readonly="{{true}}"></textarea>
+<textarea readonly="{true}"></textarea>
diff --git a/test/runtime/samples/attribute-dynamic-multiple/main.html b/test/runtime/samples/attribute-dynamic-multiple/main.html
index 7133f1e330..45a17cdac1 100644
--- a/test/runtime/samples/attribute-dynamic-multiple/main.html
+++ b/test/runtime/samples/attribute-dynamic-multiple/main.html
@@ -1,3 +1,3 @@
-{{#each items as item, i}}
-	<div class='{{item.foo ? "foo" : ""}} {{item.bar ? "bar" : ""}}'>{{i + 1}}</div>
-{{/each}}
+{#each items as item, i}
+	<div class='{item.foo ? "foo" : ""} {item.bar ? "bar" : ""}'>{i + 1}</div>
+{/each}
diff --git a/test/runtime/samples/attribute-dynamic-quotemarks/main.html b/test/runtime/samples/attribute-dynamic-quotemarks/main.html
index b5c3be5bbd..a2e0495ea7 100644
--- a/test/runtime/samples/attribute-dynamic-quotemarks/main.html
+++ b/test/runtime/samples/attribute-dynamic-quotemarks/main.html
@@ -1 +1 @@
-<span title='{{"\"foo\""}}'>foo</span>
+<span title='{"\"foo\""}'>foo</span>
diff --git a/test/runtime/samples/attribute-dynamic-reserved/main.html b/test/runtime/samples/attribute-dynamic-reserved/main.html
index 47185118e2..f0318b96de 100644
--- a/test/runtime/samples/attribute-dynamic-reserved/main.html
+++ b/test/runtime/samples/attribute-dynamic-reserved/main.html
@@ -1 +1 @@
-<div class='{{class}}'></div>{{123}}
+<div class='{class}'></div>{123}
diff --git a/test/runtime/samples/attribute-dynamic-shorthand/main-v2.html b/test/runtime/samples/attribute-dynamic-shorthand/main-v2.html
deleted file mode 100644
index 9bbc477272..0000000000
--- a/test/runtime/samples/attribute-dynamic-shorthand/main-v2.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div {id}/>
-
-<script>
-	export default {
-		data: () => ({
-			id: 'foo'
-		})
-	};
-</script>
diff --git a/test/runtime/samples/attribute-dynamic-shorthand/main.html b/test/runtime/samples/attribute-dynamic-shorthand/main.html
index 25b468a8f1..9bbc477272 100644
--- a/test/runtime/samples/attribute-dynamic-shorthand/main.html
+++ b/test/runtime/samples/attribute-dynamic-shorthand/main.html
@@ -1,4 +1,4 @@
-<div :id/>
+<div {id}/>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/attribute-dynamic-type/main.html b/test/runtime/samples/attribute-dynamic-type/main.html
index 5bafd96cb3..3aa25e3026 100644
--- a/test/runtime/samples/attribute-dynamic-type/main.html
+++ b/test/runtime/samples/attribute-dynamic-type/main.html
@@ -1 +1 @@
-<input type='{{inputType}}' value='{{inputValue}}'>
\ No newline at end of file
+<input type='{inputType}' value='{inputValue}'>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-dynamic/main.html b/test/runtime/samples/attribute-dynamic/main.html
index aa743b0cc1..16865c6cef 100644
--- a/test/runtime/samples/attribute-dynamic/main.html
+++ b/test/runtime/samples/attribute-dynamic/main.html
@@ -1,4 +1,4 @@
-<div style='color: {{color}};'>{{color}}</div>
+<div style='color: {color};'>{color}</div>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/attribute-namespaced/main.html b/test/runtime/samples/attribute-namespaced/main.html
index a5fb9912f8..57c7286ed9 100644
--- a/test/runtime/samples/attribute-namespaced/main.html
+++ b/test/runtime/samples/attribute-namespaced/main.html
@@ -1,3 +1,3 @@
 <svg>
-	<use xlink:href="#{{foo}}"/>
+	<use xlink:href="#{foo}"/>
 </svg>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-partial-number/Component.html b/test/runtime/samples/attribute-partial-number/Component.html
index c48ee295fc..039386e88b 100644
--- a/test/runtime/samples/attribute-partial-number/Component.html
+++ b/test/runtime/samples/attribute-partial-number/Component.html
@@ -1 +1 @@
-<p data-value="{{value}}"></p>
+<p data-value="{value}"></p>
diff --git a/test/runtime/samples/attribute-prefer-expression/main.html b/test/runtime/samples/attribute-prefer-expression/main.html
index c69a83993d..111c9803c0 100644
--- a/test/runtime/samples/attribute-prefer-expression/main.html
+++ b/test/runtime/samples/attribute-prefer-expression/main.html
@@ -1,2 +1,2 @@
-<input type='radio' bind:group='foo' value='{{false}}'>
-<input type='radio' bind:group='foo' value='{{true}}'>
+<input type='radio' bind:group='foo' value='{false}'>
+<input type='radio' bind:group='foo' value='{true}'>
diff --git a/test/runtime/samples/autofocus/main.html b/test/runtime/samples/autofocus/main.html
index 9a114344ce..b79b60f4ce 100644
--- a/test/runtime/samples/autofocus/main.html
+++ b/test/runtime/samples/autofocus/main.html
@@ -1,3 +1,3 @@
-{{#if visible}}
+{#if visible}
 	<input ref:input autofocus>
-{{/if}}
+{/if}
diff --git a/test/runtime/samples/await-component-oncreate/Foo.html b/test/runtime/samples/await-component-oncreate/Foo.html
index 61362eee09..9648ef01df 100644
--- a/test/runtime/samples/await-component-oncreate/Foo.html
+++ b/test/runtime/samples/await-component-oncreate/Foo.html
@@ -1,5 +1,5 @@
-<p>{{value}}</p>
-<p>{{called}}</p>
+<p>{value}</p>
+<p>{called}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/await-component-oncreate/main.html b/test/runtime/samples/await-component-oncreate/main.html
index 579f19f199..8126271879 100644
--- a/test/runtime/samples/await-component-oncreate/main.html
+++ b/test/runtime/samples/await-component-oncreate/main.html
@@ -1,6 +1,6 @@
-{{#await promise then value}}
-	<Foo :value />
-{{/await}}
+{#await promise then value}
+	<Foo {value} />
+{/await}
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/await-set-simultaneous/main.html b/test/runtime/samples/await-set-simultaneous/main.html
index 3740a90480..fa32f62f63 100644
--- a/test/runtime/samples/await-set-simultaneous/main.html
+++ b/test/runtime/samples/await-set-simultaneous/main.html
@@ -1,9 +1,9 @@
-{{#if promise}}
-	{{#await promise}}
+{#if promise}
+	{#await promise}
 		<p>wait for it...</p>
-	{{then _}}
-		<p>the answer is {{answer}}!</p>
-	{{catch error}}
+	{:then _}
+		<p>the answer is {answer}!</p>
+	{:catch error}
 		<p>well that's odd</p>
-	{{/await}}
-{{/if}}
\ No newline at end of file
+	{/await}
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-catch-anchor/main.html b/test/runtime/samples/await-then-catch-anchor/main.html
index b8e32962fa..94e6572be4 100644
--- a/test/runtime/samples/await-then-catch-anchor/main.html
+++ b/test/runtime/samples/await-then-catch-anchor/main.html
@@ -1,9 +1,9 @@
 <div>
-{{#await thePromise}}
+{#await thePromise}
 <p>loading...</p>
-{{then theValue}}
-<p>the value is {{theValue}}</p>
-{{catch theError}}
-<p>oh no! {{theError.message}}</p>
-{{/await}}
+{:then theValue}
+<p>the value is {theValue}</p>
+{:catch theError}
+<p>oh no! {theError.message}</p>
+{/await}
 </div>
diff --git a/test/runtime/samples/await-then-catch-event/main.html b/test/runtime/samples/await-then-catch-event/main.html
index 29e328edb2..3b94adfd5a 100644
--- a/test/runtime/samples/await-then-catch-event/main.html
+++ b/test/runtime/samples/await-then-catch-event/main.html
@@ -1,7 +1,7 @@
-{{#await thePromise}}
+{#await thePromise}
 	<p>loading...</p>
-{{then theValue}}
+{:then theValue}
 	<button ref:button on:click='set({ clicked: theValue })'>click me</button>
-{{catch theError}}
-	<p>oh no! {{theError.message}}</p>
-{{/await}}
\ No newline at end of file
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-catch-if/main.html b/test/runtime/samples/await-then-catch-if/main.html
index 20449734d4..f9684c8257 100644
--- a/test/runtime/samples/await-then-catch-if/main.html
+++ b/test/runtime/samples/await-then-catch-if/main.html
@@ -1,11 +1,11 @@
-{{#if show}}
-{{#await thePromise}}
+{#if show}
+{#await thePromise}
 <p>loading...</p>
-{{then theValue}}
-<p>the value is {{theValue}}</p>
-{{catch theError}}
-<p>oh no! {{theError.message}}</p>
-{{/await}}
-{{else}}
+{:then theValue}
+<p>the value is {theValue}</p>
+{:catch theError}
+<p>oh no! {theError.message}</p>
+{/await}
+{:else}
 <p>Else</p>
-{{/if}}
+{/if}
diff --git a/test/runtime/samples/await-then-catch-in-slot/main.html b/test/runtime/samples/await-then-catch-in-slot/main.html
index 34519e8c23..327f91f804 100644
--- a/test/runtime/samples/await-then-catch-in-slot/main.html
+++ b/test/runtime/samples/await-then-catch-in-slot/main.html
@@ -1,11 +1,11 @@
 <Foo>
-	{{#await thePromise}}
+	{#await thePromise}
 		<p>loading...</p>
-	{{then theValue}}
-		<p>the value is {{theValue}}</p>
-	{{catch theError}}
-		<p>oh no! {{theError.message}}</p>
-	{{/await}}
+	{:then theValue}
+		<p>the value is {theValue}</p>
+	{:catch theError}
+		<p>oh no! {theError.message}</p>
+	{/await}
 </Foo>
 
 <script>
diff --git a/test/runtime/samples/await-then-catch-multiple/main.html b/test/runtime/samples/await-then-catch-multiple/main.html
index eb071c27a8..34cdcb9604 100644
--- a/test/runtime/samples/await-then-catch-multiple/main.html
+++ b/test/runtime/samples/await-then-catch-multiple/main.html
@@ -1,15 +1,15 @@
-{{#await thePromise}}
+{#await thePromise}
 	<p>loading...</p>
-{{then theValue}}
-	<p>the value is {{theValue}}</p>
-{{catch theError}}
-	<p>oh no! {{theError.message}}</p>
-{{/await}}
+{:then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}
 
-{{#await thePromise}}
+{#await thePromise}
 	<p>loading...</p>
-{{then theValue}}
-	<p>the value is {{theValue}}</p>
-{{catch theError}}
-	<p>oh no! {{theError.message}}</p>
-{{/await}}
\ No newline at end of file
+{:then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-catch-non-promise/main.html b/test/runtime/samples/await-then-catch-non-promise/main.html
index 36489b9043..79f5162ace 100644
--- a/test/runtime/samples/await-then-catch-non-promise/main.html
+++ b/test/runtime/samples/await-then-catch-non-promise/main.html
@@ -1,7 +1,7 @@
-{{#await thePromise}}
+{#await thePromise}
 	<p>loading...</p>
-{{then theValue}}
-	<p>the value is {{theValue}}</p>
-{{catch theError}}
-	<p>oh no! {{theError.message}}</p>
-{{/await}}
\ No newline at end of file
+{:then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-catch/main.html b/test/runtime/samples/await-then-catch/main.html
index 36489b9043..79f5162ace 100644
--- a/test/runtime/samples/await-then-catch/main.html
+++ b/test/runtime/samples/await-then-catch/main.html
@@ -1,7 +1,7 @@
-{{#await thePromise}}
+{#await thePromise}
 	<p>loading...</p>
-{{then theValue}}
-	<p>the value is {{theValue}}</p>
-{{catch theError}}
-	<p>oh no! {{theError.message}}</p>
-{{/await}}
\ No newline at end of file
+{:then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-shorthand/main.html b/test/runtime/samples/await-then-shorthand/main.html
index cf121d5b8c..aa2e3a76b2 100644
--- a/test/runtime/samples/await-then-shorthand/main.html
+++ b/test/runtime/samples/await-then-shorthand/main.html
@@ -1,5 +1,5 @@
-{{#await thePromise then theValue}}
-	<p>the value is {{theValue}}</p>
-{{catch theError}}
-	<p>oh no! {{theError.message}}</p>
-{{/await}}
\ No newline at end of file
+{#await thePromise then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-indirect-computed/main.html b/test/runtime/samples/binding-indirect-computed/main.html
index 88e638bf30..e41b5813c3 100644
--- a/test/runtime/samples/binding-indirect-computed/main.html
+++ b/test/runtime/samples/binding-indirect-computed/main.html
@@ -1,10 +1,10 @@
 <select bind:value="selected.letter">
-	{{#each uppercase as letter}}
-		<option value="{{letter}}">{{letter}}</option>
-	{{/each}}
+	{#each uppercase as letter}
+		<option value="{letter}">{letter}</option>
+	{/each}
 </select>
 
-{{selected.letter}}
+{selected.letter}
 
 <script>
 	export default {
@@ -21,7 +21,7 @@
 			}
 		},
 		computed:{
-			uppercase: letters => letters.map(x => x.toUpperCase())
+			uppercase: ({ letters }) => letters.map(x => x.toUpperCase())
 		}
 	};
 </script>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-indirect/main.html b/test/runtime/samples/binding-indirect/main.html
index e1ab12c82f..df37840b43 100644
--- a/test/runtime/samples/binding-indirect/main.html
+++ b/test/runtime/samples/binding-indirect/main.html
@@ -1,14 +1,14 @@
 <select bind:value='selected'>
-	{{#each tasks as task}}
-		<option value='{{task}}'>{{task.description}}</option>
-	{{/each}}
+	{#each tasks as task}
+		<option value='{task}'>{task.description}</option>
+	{/each}
 </select>
 
 <label>
-	<input type='checkbox' bind:checked='selected.done'> {{selected.description}}
+	<input type='checkbox' bind:checked='selected.done'> {selected.description}
 </label>
 
 <h2>Pending tasks</h2>
-{{#each tasks.filter(t => !t.done) as task}}
-	<p>{{task.description}}</p>
-{{/each}}
\ No newline at end of file
+{#each tasks.filter(t => !t.done) as task}
+	<p>{task.description}</p>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-checkbox-deep-contextual/main.html b/test/runtime/samples/binding-input-checkbox-deep-contextual/main.html
index dc385a4990..209cdbeaf7 100644
--- a/test/runtime/samples/binding-input-checkbox-deep-contextual/main.html
+++ b/test/runtime/samples/binding-input-checkbox-deep-contextual/main.html
@@ -1,13 +1,13 @@
-{{#each items as item}}
-	<div><input type='checkbox' bind:checked='item.completed'><p>{{item.description}}</p></div>
-{{/each}}
+{#each items as item}
+	<div><input type='checkbox' bind:checked='item.completed'><p>{item.description}</p></div>
+{/each}
 
-<p>{{numCompleted}} completed</p>
+<p>{numCompleted} completed</p>
 
 <script>
 	export default {
 		computed: {
-			numCompleted ( items ) {
+			numCompleted ({ items }) {
 				return items.reduce( ( total, item ) => total + ( item.completed ? 1 : 0 ), 0 );
 			}
 		}
diff --git a/test/runtime/samples/binding-input-checkbox-group-outside-each/main.html b/test/runtime/samples/binding-input-checkbox-group-outside-each/main.html
index 126f7b79c1..09a664d795 100644
--- a/test/runtime/samples/binding-input-checkbox-group-outside-each/main.html
+++ b/test/runtime/samples/binding-input-checkbox-group-outside-each/main.html
@@ -1,13 +1,13 @@
 <label>
-	<input type="checkbox" value="{{values[0]}}" bind:group='selected' /> {{values[0].name}}
+	<input type="checkbox" value="{values[0]}" bind:group='selected' /> {values[0].name}
 </label>
 
 <label>
-	<input type="checkbox" value="{{values[1]}}" bind:group='selected' /> {{values[1].name}}
+	<input type="checkbox" value="{values[1]}" bind:group='selected' /> {values[1].name}
 </label>
 
 <label>
-	<input type="checkbox" value="{{values[2]}}" bind:group='selected' /> {{values[2].name}}
+	<input type="checkbox" value="{values[2]}" bind:group='selected' /> {values[2].name}
 </label>
 
-<p>{{selected.map( function ( value ) { return value.name; }).join( ', ' ) }}</p>
\ No newline at end of file
+<p>{selected.map( function ( value ) { return value.name; }).join( ', ' ) }</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-checkbox-group/main.html b/test/runtime/samples/binding-input-checkbox-group/main.html
index c06482c56f..000ebf919a 100644
--- a/test/runtime/samples/binding-input-checkbox-group/main.html
+++ b/test/runtime/samples/binding-input-checkbox-group/main.html
@@ -1,7 +1,7 @@
-{{#each values as value}}
+{#each values as value}
 	<label>
-		<input type="checkbox" value="{{value}}" bind:group='selected' /> {{value.name}}
+		<input type="checkbox" value="{value}" bind:group='selected' /> {value.name}
 	</label>
-{{/each}}
+{/each}
 
-<p>{{selected.map( function ( value ) { return value.name; }).join( ', ' ) }}</p>
\ No newline at end of file
+<p>{selected.map( function ( value ) { return value.name; }).join( ', ' ) }</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-checkbox-indeterminate/main.html b/test/runtime/samples/binding-input-checkbox-indeterminate/main.html
index e4c83224f9..e515599dcc 100644
--- a/test/runtime/samples/binding-input-checkbox-indeterminate/main.html
+++ b/test/runtime/samples/binding-input-checkbox-indeterminate/main.html
@@ -1,3 +1,3 @@
 <input type='checkbox' bind:checked bind:indeterminate>
-<p>checked? {{checked}}</p>
-<p>indeterminate? {{indeterminate}}</p>
+<p>checked? {checked}</p>
+<p>indeterminate? {indeterminate}</p>
diff --git a/test/runtime/samples/binding-input-checkbox/main.html b/test/runtime/samples/binding-input-checkbox/main.html
index 2ab8592831..47562d6adc 100644
--- a/test/runtime/samples/binding-input-checkbox/main.html
+++ b/test/runtime/samples/binding-input-checkbox/main.html
@@ -1,2 +1,2 @@
 <input type='checkbox' bind:checked='foo'>
-<p>{{foo}}</p>
+<p>{foo}</p>
diff --git a/test/runtime/samples/binding-input-number/main.html b/test/runtime/samples/binding-input-number/main.html
index 12b0bae263..2a581dc675 100644
--- a/test/runtime/samples/binding-input-number/main.html
+++ b/test/runtime/samples/binding-input-number/main.html
@@ -1,2 +1,2 @@
 <input type='number' bind:value='count'>
-<p>{{typeof count}} {{count}}</p>
+<p>{typeof count} {count}</p>
diff --git a/test/runtime/samples/binding-input-radio-group/main.html b/test/runtime/samples/binding-input-radio-group/main.html
index 1b5c1a4d7c..8a5794ff01 100644
--- a/test/runtime/samples/binding-input-radio-group/main.html
+++ b/test/runtime/samples/binding-input-radio-group/main.html
@@ -1,7 +1,7 @@
-{{#each values as value}}
+{#each values as value}
 	<label>
-		<input type="radio" value="{{value}}" bind:group='selected' /> {{value.name}}
+		<input type="radio" value="{value}" bind:group='selected' /> {value.name}
 	</label>
-{{/each}}
+{/each}
 
-<p>{{selected.name}}</p>
\ No newline at end of file
+<p>{selected.name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-range-change/main.html b/test/runtime/samples/binding-input-range-change/main.html
index bedf924f98..0fbddb74aa 100644
--- a/test/runtime/samples/binding-input-range-change/main.html
+++ b/test/runtime/samples/binding-input-range-change/main.html
@@ -1,2 +1,2 @@
 <input type='range' bind:value='count'>
-<p>{{typeof count}} {{count}}</p>
+<p>{typeof count} {count}</p>
diff --git a/test/runtime/samples/binding-input-range/main.html b/test/runtime/samples/binding-input-range/main.html
index bedf924f98..0fbddb74aa 100644
--- a/test/runtime/samples/binding-input-range/main.html
+++ b/test/runtime/samples/binding-input-range/main.html
@@ -1,2 +1,2 @@
 <input type='range' bind:value='count'>
-<p>{{typeof count}} {{count}}</p>
+<p>{typeof count} {count}</p>
diff --git a/test/runtime/samples/binding-input-text-contextual/main.html b/test/runtime/samples/binding-input-text-contextual/main.html
index 5f07fadc26..7b3f35244f 100644
--- a/test/runtime/samples/binding-input-text-contextual/main.html
+++ b/test/runtime/samples/binding-input-text-contextual/main.html
@@ -1,3 +1,3 @@
-{{#each items as item}}
-	<div><input bind:value='item'><p>{{item}}</p></div>
-{{/each}}
+{#each items as item}
+	<div><input bind:value='item'><p>{item}</p></div>
+{/each}
diff --git a/test/runtime/samples/binding-input-text-deconflicted/main.html b/test/runtime/samples/binding-input-text-deconflicted/main.html
index 391a47c3f1..9d631bf040 100644
--- a/test/runtime/samples/binding-input-text-deconflicted/main.html
+++ b/test/runtime/samples/binding-input-text-deconflicted/main.html
@@ -1,2 +1,2 @@
-<h1>Hello {{component.name}}!</h1>
+<h1>Hello {component.name}!</h1>
 <input bind:value="component.name"/>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-deep-computed-dynamic/main.html b/test/runtime/samples/binding-input-text-deep-computed-dynamic/main.html
index 3a95b383e4..d3afde0a7a 100644
--- a/test/runtime/samples/binding-input-text-deep-computed-dynamic/main.html
+++ b/test/runtime/samples/binding-input-text-deep-computed-dynamic/main.html
@@ -1,2 +1,2 @@
 <input bind:value='obj[prop]'>
-<pre>{{JSON.stringify(obj)}}</pre>
\ No newline at end of file
+<pre>{JSON.stringify(obj)}</pre>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-deep-computed/main.html b/test/runtime/samples/binding-input-text-deep-computed/main.html
index 281849a4d0..55ad4b53fa 100644
--- a/test/runtime/samples/binding-input-text-deep-computed/main.html
+++ b/test/runtime/samples/binding-input-text-deep-computed/main.html
@@ -1,2 +1,2 @@
 <input bind:value='user[prop]'>
-<p>hello {{user.name}}</p>
+<p>hello {user.name}</p>
diff --git a/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/main.html b/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/main.html
index b2f36850f4..1af3bee5b6 100644
--- a/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/main.html
+++ b/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/main.html
@@ -1,4 +1,4 @@
-{{#each objects as obj}}
+{#each objects as obj}
 	<input bind:value='obj[prop]'>
-	<pre>{{JSON.stringify(obj)}}</pre>
-{{/each}}
\ No newline at end of file
+	<pre>{JSON.stringify(obj)}</pre>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-deep-contextual/main.html b/test/runtime/samples/binding-input-text-deep-contextual/main.html
index 210e4e4fea..7d21a2ddb2 100644
--- a/test/runtime/samples/binding-input-text-deep-contextual/main.html
+++ b/test/runtime/samples/binding-input-text-deep-contextual/main.html
@@ -1,3 +1,3 @@
-{{#each items as item}}
-	<div><input bind:value='item.description'><p>{{item.description}}</p></div>
-{{/each}}
+{#each items as item}
+	<div><input bind:value='item.description'><p>{item.description}</p></div>
+{/each}
diff --git a/test/runtime/samples/binding-input-text-deep/main.html b/test/runtime/samples/binding-input-text-deep/main.html
index 8ed32a7e90..f7f7d4dbc0 100644
--- a/test/runtime/samples/binding-input-text-deep/main.html
+++ b/test/runtime/samples/binding-input-text-deep/main.html
@@ -1,2 +1,2 @@
 <input bind:value='user.name'>
-<p>hello {{user.name}}</p>
+<p>hello {user.name}</p>
diff --git a/test/runtime/samples/binding-input-text/main.html b/test/runtime/samples/binding-input-text/main.html
index 806f31fbdd..143c9054b1 100644
--- a/test/runtime/samples/binding-input-text/main.html
+++ b/test/runtime/samples/binding-input-text/main.html
@@ -1,2 +1,2 @@
 <input bind:value='name'>
-<p>hello {{name}}</p>
+<p>hello {name}</p>
diff --git a/test/runtime/samples/binding-select-implicit-option-value/main.html b/test/runtime/samples/binding-select-implicit-option-value/main.html
index ec5cc84a8d..3fffa9256a 100644
--- a/test/runtime/samples/binding-select-implicit-option-value/main.html
+++ b/test/runtime/samples/binding-select-implicit-option-value/main.html
@@ -1,7 +1,7 @@
 <select bind:value='foo'>
-	{{#each values as v}}
-		<option>{{v}}</option>
-	{{/each}}
+	{#each values as v}
+		<option>{v}</option>
+	{/each}
 </select>
 
-<p>foo: {{foo}}</p>
\ No newline at end of file
+<p>foo: {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-in-each-block/main.html b/test/runtime/samples/binding-select-in-each-block/main.html
index f61ee5b2ca..68281ebe7a 100644
--- a/test/runtime/samples/binding-select-in-each-block/main.html
+++ b/test/runtime/samples/binding-select-in-each-block/main.html
@@ -1,6 +1,6 @@
-{{#each items as item}}
+{#each items as item}
 	<select bind:value="item.value">
 		<option value="hullo">Hullo</option>
 		<option value="world">World</option>
 	</select>
-{{/each}}
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-in-yield/Modal.html b/test/runtime/samples/binding-select-in-yield/Modal.html
index b45eeb23a3..ceeece2ddd 100644
--- a/test/runtime/samples/binding-select-in-yield/Modal.html
+++ b/test/runtime/samples/binding-select-in-yield/Modal.html
@@ -1,6 +1,6 @@
-{{#if !hidden}}
+{#if !hidden}
 	<slot></slot>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/binding-select-in-yield/main.html b/test/runtime/samples/binding-select-in-yield/main.html
index 6ed86dc288..3dd21cdc7b 100644
--- a/test/runtime/samples/binding-select-in-yield/main.html
+++ b/test/runtime/samples/binding-select-in-yield/main.html
@@ -1,9 +1,9 @@
 <Modal ref:modal>
-	<span>{{letter}}</span>
+	<span>{letter}</span>
 	<select bind:value='letter'>
-		{{#each letters as letter}}
-			<option value="{{letter}}">{{letter}}</option>
-		{{/each}}
+		{#each letters as letter}
+			<option value="{letter}">{letter}</option>
+		{/each}
 	</select>
 </Modal>
 
diff --git a/test/runtime/samples/binding-select-initial-value-undefined/main.html b/test/runtime/samples/binding-select-initial-value-undefined/main.html
index ea15402240..0f7f90fed7 100644
--- a/test/runtime/samples/binding-select-initial-value-undefined/main.html
+++ b/test/runtime/samples/binding-select-initial-value-undefined/main.html
@@ -1,4 +1,4 @@
-<p>selected: {{selected}}</p>
+<p>selected: {selected}</p>
 
 <select bind:value='selected'>
 	<option>a</option>
@@ -6,4 +6,4 @@
 	<option>c</option>
 </select>
 
-<p>selected: {{selected}}</p>
\ No newline at end of file
+<p>selected: {selected}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-initial-value/main.html b/test/runtime/samples/binding-select-initial-value/main.html
index ea15402240..0f7f90fed7 100644
--- a/test/runtime/samples/binding-select-initial-value/main.html
+++ b/test/runtime/samples/binding-select-initial-value/main.html
@@ -1,4 +1,4 @@
-<p>selected: {{selected}}</p>
+<p>selected: {selected}</p>
 
 <select bind:value='selected'>
 	<option>a</option>
@@ -6,4 +6,4 @@
 	<option>c</option>
 </select>
 
-<p>selected: {{selected}}</p>
\ No newline at end of file
+<p>selected: {selected}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-late/main.html b/test/runtime/samples/binding-select-late/main.html
index 0bbebef662..2cbbff8b4a 100644
--- a/test/runtime/samples/binding-select-late/main.html
+++ b/test/runtime/samples/binding-select-late/main.html
@@ -1,7 +1,7 @@
 <select bind:value='selected'>
-	{{#each items as item}}
-		<option>{{item}}</option>
-	{{/each}}
+	{#each items as item}
+		<option>{item}</option>
+	{/each}
 </select>
 
-<p>selected: {{selected || 'nothing'}}</p>
+<p>selected: {selected || 'nothing'}</p>
diff --git a/test/runtime/samples/binding-select-multiple/main.html b/test/runtime/samples/binding-select-multiple/main.html
index dc221c13e4..c4d33dc2c0 100644
--- a/test/runtime/samples/binding-select-multiple/main.html
+++ b/test/runtime/samples/binding-select-multiple/main.html
@@ -4,4 +4,4 @@
 	<option>three</option>
 </select>
 
-<p>selected: {{selected.join( ', ' )}}</p>
+<p>selected: {selected.join( ', ' )}</p>
diff --git a/test/runtime/samples/binding-select-optgroup/main.html b/test/runtime/samples/binding-select-optgroup/main.html
index 2160d0e2a8..c0df0cf8f6 100644
--- a/test/runtime/samples/binding-select-optgroup/main.html
+++ b/test/runtime/samples/binding-select-optgroup/main.html
@@ -1,4 +1,4 @@
-<h1>Hello {{name}}!</h1>
+<h1>Hello {name}!</h1>
 
 <select bind:value="name">
 	<option value="Harry">Harry</option>
diff --git a/test/runtime/samples/binding-select/main.html b/test/runtime/samples/binding-select/main.html
index f05b8a89e4..84795bfa86 100644
--- a/test/runtime/samples/binding-select/main.html
+++ b/test/runtime/samples/binding-select/main.html
@@ -1,4 +1,4 @@
-<p>selected: {{selected}}</p>
+<p>selected: {selected}</p>
 
 <select bind:value='selected'>
 	<option>one</option>
@@ -6,4 +6,4 @@
 	<option>three</option>
 </select>
 
-<p>selected: {{selected}}</p>
+<p>selected: {selected}</p>
diff --git a/test/runtime/samples/binding-textarea/main.html b/test/runtime/samples/binding-textarea/main.html
index 1ee199e30b..1f3f0caebd 100644
--- a/test/runtime/samples/binding-textarea/main.html
+++ b/test/runtime/samples/binding-textarea/main.html
@@ -1,2 +1,2 @@
 <textarea bind:value></textarea>
-<p>{{value}}</p>
+<p>{value}</p>
diff --git a/test/runtime/samples/bindings-before-oncreate/Two.html b/test/runtime/samples/bindings-before-oncreate/Two.html
index f6fc00fcaf..a1143a68f1 100644
--- a/test/runtime/samples/bindings-before-oncreate/Two.html
+++ b/test/runtime/samples/bindings-before-oncreate/Two.html
@@ -7,7 +7,7 @@
 		},
 
 		computed: {
-			foo(bar) {
+			foo({ bar }) {
 				return bar * 2;
 			}
 		}
diff --git a/test/runtime/samples/bindings-coalesced/Foo.html b/test/runtime/samples/bindings-coalesced/Foo.html
index 5d453fbb73..3b6b796ccb 100644
--- a/test/runtime/samples/bindings-coalesced/Foo.html
+++ b/test/runtime/samples/bindings-coalesced/Foo.html
@@ -1,5 +1,5 @@
-<p>bar in Foo: {{bar}}</p>
-<p>baz in Foo: {{baz}}</p>
+<p>bar in Foo: {bar}</p>
+<p>baz in Foo: {baz}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/bindings-coalesced/main.html b/test/runtime/samples/bindings-coalesced/main.html
index fc17036077..c98ae0f8df 100644
--- a/test/runtime/samples/bindings-coalesced/main.html
+++ b/test/runtime/samples/bindings-coalesced/main.html
@@ -1,5 +1,5 @@
 <Foo ref:foo bind:bar bind:baz/>
-<p ref:p>{{bar + baz}}</p>
+<p ref:p>{bar + baz}</p>
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/component-binding-blowback-b/main.html b/test/runtime/samples/component-binding-blowback-b/main.html
index 4e3ca43813..301f5b7da8 100644
--- a/test/runtime/samples/component-binding-blowback-b/main.html
+++ b/test/runtime/samples/component-binding-blowback-b/main.html
@@ -1,11 +1,11 @@
 <input type='number' bind:value='count'>
 
 <ol>
-	{{#each ids as id}}
-		<Nested :id bind:value="idToValue[id]">
-			{{id}}: value is {{idToValue[id]}}
+	{#each ids as id}
+		<Nested {id} bind:value="idToValue[id]">
+			{id}: value is {idToValue[id]}
 		</Nested>
-	{{/each}}
+	{/each}
 </ol>
 
 <script>
@@ -19,7 +19,7 @@
 		},
 
 		computed: {
-			ids(count) {
+			ids({ count }) {
 				return new Array(count)
 					.fill(null)
 					.map((_, i) => 'id-' + i);
diff --git a/test/runtime/samples/component-binding-blowback-c/Nested.html b/test/runtime/samples/component-binding-blowback-c/Nested.html
index 9012e84629..7a55118ec0 100644
--- a/test/runtime/samples/component-binding-blowback-c/Nested.html
+++ b/test/runtime/samples/component-binding-blowback-c/Nested.html
@@ -1,5 +1,5 @@
 <li>
-	{{yield}}
+	<slot></slot>
 </li>
 
 <script>
diff --git a/test/runtime/samples/component-binding-blowback-c/main.html b/test/runtime/samples/component-binding-blowback-c/main.html
index 3cf809552b..21d69d3c40 100644
--- a/test/runtime/samples/component-binding-blowback-c/main.html
+++ b/test/runtime/samples/component-binding-blowback-c/main.html
@@ -1,11 +1,11 @@
 <input type='number' bind:value='count'>
 
 <ol>
-	{{#each ids as object @id}}
-		<Nested bind:value='idToValue[object.id]' id='{{object.id}}'>
-			{{object.id}}: value is {{idToValue[object.id]}}
+	{#each ids as object (object.id)}
+		<Nested bind:value='idToValue[object.id]' id='{object.id}'>
+			{object.id}: value is {idToValue[object.id]}
 		</Nested>
-	{{/each}}
+	{/each}
 </ol>
 
 <script>
@@ -19,7 +19,7 @@
 		},
 
 		computed: {
-			ids(count) {
+			ids({ count }) {
 				return new Array(count)
 					.fill(null)
 					.map((_, i) => ({ id: 'id-' + i}))
diff --git a/test/runtime/samples/component-binding-blowback/main.html b/test/runtime/samples/component-binding-blowback/main.html
index e028fe32ab..edb9b0e8b0 100644
--- a/test/runtime/samples/component-binding-blowback/main.html
+++ b/test/runtime/samples/component-binding-blowback/main.html
@@ -1,6 +1,6 @@
-{{#if x}}
+{#if x}
 	<Widget bind:foo='bar.baz'/>
-{{/if}}
+{/if}
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/component-binding-computed/Nested.html b/test/runtime/samples/component-binding-computed/Nested.html
index ca75184db2..642aa7eb34 100644
--- a/test/runtime/samples/component-binding-computed/Nested.html
+++ b/test/runtime/samples/component-binding-computed/Nested.html
@@ -1,3 +1,3 @@
 <label>
-	{{field}} <input bind:value>
+	{field} <input bind:value>
 </label>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-computed/main.html b/test/runtime/samples/component-binding-computed/main.html
index 9ac402fec8..af6283b5bf 100644
--- a/test/runtime/samples/component-binding-computed/main.html
+++ b/test/runtime/samples/component-binding-computed/main.html
@@ -1,6 +1,6 @@
-{{#each fields as field}}
-	<Nested :field bind:value='values[field]'/>
-{{/each}}
+{#each fields as field}
+	<Nested {field} bind:value='values[field]'/>
+{/each}
 
 <script>
 	import Nested from './Nested.html';
diff --git a/test/runtime/samples/component-binding-conditional-b/Bar.html b/test/runtime/samples/component-binding-conditional-b/Bar.html
index 062ba1a954..17bd4cfe70 100644
--- a/test/runtime/samples/component-binding-conditional-b/Bar.html
+++ b/test/runtime/samples/component-binding-conditional-b/Bar.html
@@ -1,4 +1,4 @@
-<p>y: {{y}}</p>
+<p>y: {y}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/component-binding-conditional-b/Foo.html b/test/runtime/samples/component-binding-conditional-b/Foo.html
index 7cf8a718ca..6365b7433e 100644
--- a/test/runtime/samples/component-binding-conditional-b/Foo.html
+++ b/test/runtime/samples/component-binding-conditional-b/Foo.html
@@ -1,4 +1,4 @@
-<p>y: {{y}}</p>
+<p>y: {y}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/component-binding-conditional-b/main.html b/test/runtime/samples/component-binding-conditional-b/main.html
index 6c13240657..d72129b100 100644
--- a/test/runtime/samples/component-binding-conditional-b/main.html
+++ b/test/runtime/samples/component-binding-conditional-b/main.html
@@ -1,12 +1,12 @@
-<p>y: {{y}}</p>
+<p>y: {y}</p>
 
 <Baz bind:x/>
 
-{{#if x}}
+{#if x}
 	<Foo bind:y/>
-{{else}}
+{:else}
 	<Bar bind:y/>
-{{/if}}
+{/if}
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/component-binding-conditional/Bar.html b/test/runtime/samples/component-binding-conditional/Bar.html
index 062ba1a954..17bd4cfe70 100644
--- a/test/runtime/samples/component-binding-conditional/Bar.html
+++ b/test/runtime/samples/component-binding-conditional/Bar.html
@@ -1,4 +1,4 @@
-<p>y: {{y}}</p>
+<p>y: {y}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/component-binding-conditional/Foo.html b/test/runtime/samples/component-binding-conditional/Foo.html
index 7cf8a718ca..6365b7433e 100644
--- a/test/runtime/samples/component-binding-conditional/Foo.html
+++ b/test/runtime/samples/component-binding-conditional/Foo.html
@@ -1,4 +1,4 @@
-<p>y: {{y}}</p>
+<p>y: {y}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/component-binding-conditional/main.html b/test/runtime/samples/component-binding-conditional/main.html
index c8872b4f32..b5ccdcb154 100644
--- a/test/runtime/samples/component-binding-conditional/main.html
+++ b/test/runtime/samples/component-binding-conditional/main.html
@@ -1,10 +1,10 @@
-<p>y: {{y}}</p>
+<p>y: {y}</p>
 
-{{#if x}}
+{#if x}
 	<Foo bind:y/>
-{{else}}
+{:else}
 	<Bar bind:y/>
-{{/if}}
+{/if}
 
 <Baz bind:x/>
 
diff --git a/test/runtime/samples/component-binding-deep-b/ComponentSelector.html b/test/runtime/samples/component-binding-deep-b/ComponentSelector.html
index 42cc676039..513985e332 100644
--- a/test/runtime/samples/component-binding-deep-b/ComponentSelector.html
+++ b/test/runtime/samples/component-binding-deep-b/ComponentSelector.html
@@ -1,5 +1,5 @@
 <select bind:value='selectedComponent'>
-	{{#each components as component}}
-		<option value='{{component}}'>{{component.name}}.html</option>
-	{{/each}}
+	{#each components as component}
+		<option value='{component}'>{component.name}.html</option>
+	{/each}
 </select>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-deep-b/main.html b/test/runtime/samples/component-binding-deep-b/main.html
index 0908adaf40..a0914788f3 100644
--- a/test/runtime/samples/component-binding-deep-b/main.html
+++ b/test/runtime/samples/component-binding-deep-b/main.html
@@ -1,8 +1,8 @@
-<ComponentSelector :components bind:selectedComponent/>
+<ComponentSelector {components} bind:selectedComponent/>
 <Editor bind:code='selectedComponent.source' />
 
 <pre>
-{{compiled}}
+{compiled}
 </pre>
 
 <script>
diff --git a/test/runtime/samples/component-binding-deep/main.html b/test/runtime/samples/component-binding-deep/main.html
index 0064a6092d..377b488a5f 100644
--- a/test/runtime/samples/component-binding-deep/main.html
+++ b/test/runtime/samples/component-binding-deep/main.html
@@ -1,6 +1,6 @@
 <Widget bind:value='deep.name'/>
 
-<p>{{deep.name}}</p>
+<p>{deep.name}</p>
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/component-binding-each-nested/main.html b/test/runtime/samples/component-binding-each-nested/main.html
index bdda96fe75..18a910a6c5 100644
--- a/test/runtime/samples/component-binding-each-nested/main.html
+++ b/test/runtime/samples/component-binding-each-nested/main.html
@@ -1,8 +1,8 @@
-{{#each a as x}}
+{#each a as x}
 	<Widget bind:value='x.name'/>
-{{/each}}
+{/each}
 
-<p>{{a.map(getName).join(', ')}}</p>
+<p>{a.map(getName).join(', ')}</p>
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/component-binding-each-object/Widget.html b/test/runtime/samples/component-binding-each-object/Widget.html
index bba644f351..176e7ac3cf 100644
--- a/test/runtime/samples/component-binding-each-object/Widget.html
+++ b/test/runtime/samples/component-binding-each-object/Widget.html
@@ -1 +1 @@
-<span>{{value.id}}</span>
\ No newline at end of file
+<span>{value.id}</span>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-each-object/main.html b/test/runtime/samples/component-binding-each-object/main.html
index d378fcf833..f0952436b6 100644
--- a/test/runtime/samples/component-binding-each-object/main.html
+++ b/test/runtime/samples/component-binding-each-object/main.html
@@ -1,6 +1,6 @@
-{{#each a as x}}
+{#each a as x}
 	<Widget bind:value='x'/>
-{{/each}}
+{/each}
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/component-binding-each/main.html b/test/runtime/samples/component-binding-each/main.html
index 6dbae7e403..c26dfef743 100644
--- a/test/runtime/samples/component-binding-each/main.html
+++ b/test/runtime/samples/component-binding-each/main.html
@@ -1,8 +1,8 @@
-{{#each a as x}}
+{#each a as x}
 	<Widget bind:value='x'/>
-{{/each}}
+{/each}
 
-<p>{{a.join(', ')}}</p>
+<p>{a.join(', ')}</p>
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/component-binding-infinite-loop/B.html b/test/runtime/samples/component-binding-infinite-loop/B.html
index 2b29739886..a4563bbdb2 100644
--- a/test/runtime/samples/component-binding-infinite-loop/B.html
+++ b/test/runtime/samples/component-binding-infinite-loop/B.html
@@ -1,10 +1,10 @@
-{{#each list as item}}
+{#each list as item}
 	<p>
-		<C identifier="{{item}}" bind:currentIdentifier>
-			{{item}}
+		<C identifier="{item}" bind:currentIdentifier>
+			{item}
 		</C>
 	</p>
-{{/each}}
+{/each}
 
 <script>
 import C from './C.html';
diff --git a/test/runtime/samples/component-binding-infinite-loop/C.html b/test/runtime/samples/component-binding-infinite-loop/C.html
index e3887ff78e..06c6465373 100644
--- a/test/runtime/samples/component-binding-infinite-loop/C.html
+++ b/test/runtime/samples/component-binding-infinite-loop/C.html
@@ -1,14 +1,14 @@
 <span
 	on:click="toggle()"
-	class="{{isCurrentlySelected ? 'selected' : ''}}"
+	class="{isCurrentlySelected ? 'selected' : ''}"
 >
-	{{yield}}
+	<slot></slot>
 </span>
 
 <script>
 export default {
 	computed: {
-		isCurrentlySelected: (currentIdentifier, identifier) => currentIdentifier === identifier
+		isCurrentlySelected: ({ currentIdentifier, identifier }) => currentIdentifier === identifier
 	},
 	methods: {
 		toggle() {
diff --git a/test/runtime/samples/component-binding-nested/Bar.html b/test/runtime/samples/component-binding-nested/Bar.html
index 7ad21f5627..7dd76eb933 100644
--- a/test/runtime/samples/component-binding-nested/Bar.html
+++ b/test/runtime/samples/component-binding-nested/Bar.html
@@ -1,5 +1,5 @@
 <button class='bar' on:click='set({ x: "q" })'>bar</button>
-<p>bar x: {{x}}</p>
+<p>bar x: {x}</p>
 
 <Baz bind:x/>
 
diff --git a/test/runtime/samples/component-binding-nested/Baz.html b/test/runtime/samples/component-binding-nested/Baz.html
index 6b08533185..59cb40ec8d 100644
--- a/test/runtime/samples/component-binding-nested/Baz.html
+++ b/test/runtime/samples/component-binding-nested/Baz.html
@@ -1,2 +1,2 @@
 <button class='baz' on:click='set({ x: "r" })'>baz</button>
-<p>baz x: {{x}}</p>
+<p>baz x: {x}</p>
diff --git a/test/runtime/samples/component-binding-nested/Foo.html b/test/runtime/samples/component-binding-nested/Foo.html
index 6a693275a0..f29b4e4416 100644
--- a/test/runtime/samples/component-binding-nested/Foo.html
+++ b/test/runtime/samples/component-binding-nested/Foo.html
@@ -1,5 +1,5 @@
 <button class='foo' on:click='set({ x: "p" })'>foo</button>
-<p>foo x: {{x}}</p>
+<p>foo x: {x}</p>
 
 <Bar bind:x/>
 
diff --git a/test/runtime/samples/component-binding-nested/main.html b/test/runtime/samples/component-binding-nested/main.html
index fa2d9dbc27..948adb1a7e 100644
--- a/test/runtime/samples/component-binding-nested/main.html
+++ b/test/runtime/samples/component-binding-nested/main.html
@@ -1,4 +1,4 @@
-<p>x: {{x}}</p>
+<p>x: {x}</p>
 
 <Foo bind:x/>
 
diff --git a/test/runtime/samples/component-binding-parent-supercedes-child/main.html b/test/runtime/samples/component-binding-parent-supercedes-child/main.html
index 8647718813..b75a15c7fe 100644
--- a/test/runtime/samples/component-binding-parent-supercedes-child/main.html
+++ b/test/runtime/samples/component-binding-parent-supercedes-child/main.html
@@ -1,5 +1,5 @@
 <Counter bind:count='x'/>
-<p>count: {{x}}</p>
+<p>count: {x}</p>
 
 <script>
 	import Counter from './Counter.html';
diff --git a/test/runtime/samples/component-binding-self-destroying/main.html b/test/runtime/samples/component-binding-self-destroying/main.html
index 74fa144d02..1863a6b392 100644
--- a/test/runtime/samples/component-binding-self-destroying/main.html
+++ b/test/runtime/samples/component-binding-self-destroying/main.html
@@ -1,8 +1,8 @@
-{{#if show}}
+{#if show}
 	<Nested bind:show/>
-{{else}}
+{:else}
 	<button on:click="set({show:true})">Show</button>
-{{/if}}
+{/if}
 
 <script>
 	import Nested from './Nested.html';
diff --git a/test/runtime/samples/component-binding/main.html b/test/runtime/samples/component-binding/main.html
index dc72d99879..8f534d85c9 100644
--- a/test/runtime/samples/component-binding/main.html
+++ b/test/runtime/samples/component-binding/main.html
@@ -1,5 +1,5 @@
 <Counter bind:count='x'/>
-<p>count: {{x}}</p>
+<p>count: {x}</p>
 
 <script>
 	import Counter from './Counter.html';
diff --git a/test/runtime/samples/component-data-dynamic-late/Widget.html b/test/runtime/samples/component-data-dynamic-late/Widget.html
index 6b86648ffd..3b966c83ee 100644
--- a/test/runtime/samples/component-data-dynamic-late/Widget.html
+++ b/test/runtime/samples/component-data-dynamic-late/Widget.html
@@ -1 +1 @@
-<p>{{p}}</p>
+<p>{p}</p>
diff --git a/test/runtime/samples/component-data-dynamic-late/main.html b/test/runtime/samples/component-data-dynamic-late/main.html
index 21d6c91ec5..465fcea9e1 100644
--- a/test/runtime/samples/component-data-dynamic-late/main.html
+++ b/test/runtime/samples/component-data-dynamic-late/main.html
@@ -1,6 +1,6 @@
-{{#if foo}}
-	<Widget p='{{q}}'/>
-{{/if}}
+{#if foo}
+	<Widget p='{q}'/>
+{/if}
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/component-data-dynamic-shorthand/Widget.html b/test/runtime/samples/component-data-dynamic-shorthand/Widget.html
index d465e83f81..ca3107eb98 100644
--- a/test/runtime/samples/component-data-dynamic-shorthand/Widget.html
+++ b/test/runtime/samples/component-data-dynamic-shorthand/Widget.html
@@ -1 +1 @@
-<p>foo: {{foo}}</p>
\ No newline at end of file
+<p>foo: {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-dynamic-shorthand/main.html b/test/runtime/samples/component-data-dynamic-shorthand/main.html
index 816def2c2f..deae244ac5 100644
--- a/test/runtime/samples/component-data-dynamic-shorthand/main.html
+++ b/test/runtime/samples/component-data-dynamic-shorthand/main.html
@@ -1,5 +1,5 @@
 <div>
-	<Widget :foo/>
+	<Widget {foo}/>
 </div>
 
 <script>
diff --git a/test/runtime/samples/component-data-dynamic/Widget.html b/test/runtime/samples/component-data-dynamic/Widget.html
index 43184b9ad8..a60afb741c 100644
--- a/test/runtime/samples/component-data-dynamic/Widget.html
+++ b/test/runtime/samples/component-data-dynamic/Widget.html
@@ -1,4 +1,4 @@
-<p>foo: {{foo}}</p>
-<p>baz: {{baz}} ({{typeof baz}})</p>
-<p>qux: {{qux}}</p>
-<p>quux: {{quux}}</p>
+<p>foo: {foo}</p>
+<p>baz: {baz} ({typeof baz})</p>
+<p>qux: {qux}</p>
+<p>quux: {quux}</p>
diff --git a/test/runtime/samples/component-data-dynamic/main.html b/test/runtime/samples/component-data-dynamic/main.html
index 12d5f3208b..554d4980ad 100644
--- a/test/runtime/samples/component-data-dynamic/main.html
+++ b/test/runtime/samples/component-data-dynamic/main.html
@@ -1,5 +1,5 @@
 <div>
-	<Widget foo='{{bar}}' baz='{{40 + x}}' qux='this is a {{compound}} string' quux='{{go.deeper}}'/>
+	<Widget foo='{bar}' baz='{40 + x}' qux='this is a {compound} string' quux='{go.deeper}'/>
 </div>
 
 <script>
diff --git a/test/runtime/samples/component-data-empty/Widget.html b/test/runtime/samples/component-data-empty/Widget.html
index 89d0010a35..0fbf16cc4e 100644
--- a/test/runtime/samples/component-data-empty/Widget.html
+++ b/test/runtime/samples/component-data-empty/Widget.html
@@ -1 +1 @@
-<p>foo: '{{foo}}'</p>
+<p>foo: '{foo}'</p>
diff --git a/test/runtime/samples/component-data-static-boolean-regression/Link.html b/test/runtime/samples/component-data-static-boolean-regression/Link.html
index ecdf709900..ecb75d4f33 100644
--- a/test/runtime/samples/component-data-static-boolean-regression/Link.html
+++ b/test/runtime/samples/component-data-static-boolean-regression/Link.html
@@ -1 +1 @@
-<a href={{href}}>link</a>
\ No newline at end of file
+<a href={href}>link</a>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-static-boolean/Foo.html b/test/runtime/samples/component-data-static-boolean/Foo.html
index 87db22d12d..0cc021325b 100644
--- a/test/runtime/samples/component-data-static-boolean/Foo.html
+++ b/test/runtime/samples/component-data-static-boolean/Foo.html
@@ -1 +1 @@
-<p>x: {{x}} ({{typeof x}})</p>
+<p>x: {x} ({typeof x})</p>
diff --git a/test/runtime/samples/component-data-static/Widget.html b/test/runtime/samples/component-data-static/Widget.html
index 573b6ffcc3..69fc156eab 100644
--- a/test/runtime/samples/component-data-static/Widget.html
+++ b/test/runtime/samples/component-data-static/Widget.html
@@ -1,2 +1,2 @@
-<p>foo: {{foo}}</p>
-<p>baz: {{baz}} ({{typeof baz}})</p>
+<p>foo: {foo}</p>
+<p>baz: {baz} ({typeof baz})</p>
diff --git a/test/runtime/samples/component-data-static/main.html b/test/runtime/samples/component-data-static/main.html
index 6b62cad8fd..c21df0c660 100644
--- a/test/runtime/samples/component-data-static/main.html
+++ b/test/runtime/samples/component-data-static/main.html
@@ -1,5 +1,5 @@
 <div>
-	<Widget foo='bar' baz={{42}}/>
+	<Widget foo='bar' baz={42}/>
 </div>
 
 <script>
diff --git a/test/runtime/samples/component-events-each/main.html b/test/runtime/samples/component-events-each/main.html
index e429f3f303..3d655c5df6 100644
--- a/test/runtime/samples/component-events-each/main.html
+++ b/test/runtime/samples/component-events-each/main.html
@@ -1,7 +1,7 @@
 <div>
-	{{#each items as item}}
+	{#each items as item}
 		<Widget on:foo='foo(item)'/>
-	{{/each}}
+	{/each}
 </div>
 
 <script>
diff --git a/test/runtime/samples/component-events/main.html b/test/runtime/samples/component-events/main.html
index 442ae0f989..eff15ef979 100644
--- a/test/runtime/samples/component-events/main.html
+++ b/test/runtime/samples/component-events/main.html
@@ -1,7 +1,7 @@
 <div>
-	{{#if visible}}
+	{#if visible}
 		<Widget on:destroy='fire("widgetTornDown")'/>
-	{{/if}}
+	{/if}
 </div>
 
 <script>
diff --git a/test/runtime/samples/component-if-placement/Component.html b/test/runtime/samples/component-if-placement/Component.html
index e229cff5cc..04c4841d35 100644
--- a/test/runtime/samples/component-if-placement/Component.html
+++ b/test/runtime/samples/component-if-placement/Component.html
@@ -1,3 +1,3 @@
-{{#if true}}
+{#if true}
 	<span>Component</span>
-{{/if}}
+{/if}
diff --git a/test/runtime/samples/component-if-placement/main.html b/test/runtime/samples/component-if-placement/main.html
index abb45738ba..3f8c819fdd 100644
--- a/test/runtime/samples/component-if-placement/main.html
+++ b/test/runtime/samples/component-if-placement/main.html
@@ -1,9 +1,9 @@
 <span>Before</span>
-{{#if flag}}
+{#if flag}
 	<Component/>
-{{else}}
+{:else}
 	<Component/>
-{{/if}}
+{/if}
 <span>After</span>
 
 <script>
diff --git a/test/runtime/samples/component-name-deconflicted/Nested.html b/test/runtime/samples/component-name-deconflicted/Nested.html
index c39d49c248..03411fbff3 100644
--- a/test/runtime/samples/component-name-deconflicted/Nested.html
+++ b/test/runtime/samples/component-name-deconflicted/Nested.html
@@ -1 +1 @@
-<span>{{nested}}</span>
\ No newline at end of file
+<span>{nested}</span>
\ No newline at end of file
diff --git a/test/runtime/samples/component-name-deconflicted/main.html b/test/runtime/samples/component-name-deconflicted/main.html
index 6018c378f0..c5595b73e0 100644
--- a/test/runtime/samples/component-name-deconflicted/main.html
+++ b/test/runtime/samples/component-name-deconflicted/main.html
@@ -1,8 +1,8 @@
-{{#each list as nested}}
-	{{#if true}}
-		<Nested :nested/>
-	{{/if}}
-{{/each}}
+{#each list as nested}
+	{#if true}
+		<Nested {nested}/>
+	{/if}
+{/each}
 
 <script>
 	import Nested from './Nested.html';
diff --git a/test/runtime/samples/component-nested-deep/Level2.html b/test/runtime/samples/component-nested-deep/Level2.html
index 3ab519e45c..5b2ece36c5 100644
--- a/test/runtime/samples/component-nested-deep/Level2.html
+++ b/test/runtime/samples/component-nested-deep/Level2.html
@@ -1,5 +1,5 @@
 <span>level 2</span>
-{{yield}}
+<slot></slot>
 
 <script>
 	import Level3 from './Level3.html';
diff --git a/test/runtime/samples/component-nested-deeper/Level1.html b/test/runtime/samples/component-nested-deeper/Level1.html
index 0789b14445..2ad03fc0c6 100644
--- a/test/runtime/samples/component-nested-deeper/Level1.html
+++ b/test/runtime/samples/component-nested-deeper/Level1.html
@@ -1,12 +1,12 @@
 <div class="level1">
-	{{#each values as value}}
-		<h4>level 1 #{{value}}</h4>
-		<Level2 condition="{{value % 2}}">
+	{#each values as value}
+		<h4>level 1 #{value}</h4>
+		<Level2 condition="{value % 2}">
 			<Level3>
 				<span>And more stuff goes in here</span>
 			</Level3>
 		</Level2>
-	{{/each}}
+	{/each}
 </div>
 
 <script>
diff --git a/test/runtime/samples/component-nested-deeper/Level2.html b/test/runtime/samples/component-nested-deeper/Level2.html
index 6742c7d7f9..1a255c3564 100644
--- a/test/runtime/samples/component-nested-deeper/Level2.html
+++ b/test/runtime/samples/component-nested-deeper/Level2.html
@@ -1,8 +1,8 @@
 <div class="level2" ref:wat>
 	<h4>level 2</h4>
-	{{#if condition}}
-		<span>TRUE! {{yield}}</span>
-	{{else}}
-		<span>FALSE! {{yield}}</span>
-	{{/if}}
+	{#if condition}
+		<span>TRUE! <slot></slot></span>
+	{:else}
+		<span>FALSE! <slot></slot></span>
+	{/if}
 </div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deeper/Level3.html b/test/runtime/samples/component-nested-deeper/Level3.html
index e09fc525a8..22e093fb8f 100644
--- a/test/runtime/samples/component-nested-deeper/Level3.html
+++ b/test/runtime/samples/component-nested-deeper/Level3.html
@@ -1,4 +1,4 @@
 <div class="level3" ref:thingy>
 	<h4>level 3</h4>
-	{{yield}}
+	<slot></slot>
 </div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deeper/main.html b/test/runtime/samples/component-nested-deeper/main.html
index 5ad2d9d319..e0749d49c3 100644
--- a/test/runtime/samples/component-nested-deeper/main.html
+++ b/test/runtime/samples/component-nested-deeper/main.html
@@ -1,4 +1,4 @@
-<Level1 :values/>
+<Level1 {values}/>
 
 <script>
 	import Level1 from './Level1.html';
diff --git a/test/runtime/samples/component-not-void/Link.html b/test/runtime/samples/component-not-void/Link.html
index e147954fa0..ca134c6130 100644
--- a/test/runtime/samples/component-not-void/Link.html
+++ b/test/runtime/samples/component-not-void/Link.html
@@ -1 +1 @@
-<p>{{yield}}</p>
+<p><slot></slot></p>
diff --git a/test/runtime/samples/component-slot-dynamic/Nested.html b/test/runtime/samples/component-slot-dynamic/Nested.html
index c7e0ccfad3..ff66691089 100644
--- a/test/runtime/samples/component-slot-dynamic/Nested.html
+++ b/test/runtime/samples/component-slot-dynamic/Nested.html
@@ -1,5 +1,5 @@
 <slot>
-	<span>{{foo}}</span>
+	<span>{foo}</span>
 </slot>
 
 <script>
diff --git a/test/runtime/samples/component-slot-each-block/main.html b/test/runtime/samples/component-slot-each-block/main.html
index b503c5af53..05dd7421c0 100644
--- a/test/runtime/samples/component-slot-each-block/main.html
+++ b/test/runtime/samples/component-slot-each-block/main.html
@@ -1,7 +1,7 @@
 <Nested>
-	{{#each things as thing}}
-		<span>{{thing}}</span>
-	{{/each}}
+	{#each things as thing}
+		<span>{thing}</span>
+	{/each}
 </Nested>
 
 <script>
diff --git a/test/runtime/samples/component-slot-if-block-before-node/main.html b/test/runtime/samples/component-slot-if-block-before-node/main.html
index df5fe9375d..30e04fb566 100644
--- a/test/runtime/samples/component-slot-if-block-before-node/main.html
+++ b/test/runtime/samples/component-slot-if-block-before-node/main.html
@@ -1,7 +1,7 @@
 <Nested>
-	{{#if foo}}
+	{#if foo}
 		<p>conditional</p>
-	{{/if}}
+	{/if}
 
 	<p>unconditional</p>
 </Nested>
diff --git a/test/runtime/samples/component-slot-if-block/main.html b/test/runtime/samples/component-slot-if-block/main.html
index 95f975000a..e7ce5ce2a9 100644
--- a/test/runtime/samples/component-slot-if-block/main.html
+++ b/test/runtime/samples/component-slot-if-block/main.html
@@ -1,9 +1,9 @@
 <Nested>
 	<p>unconditional</p>
 
-	{{#if foo}}
+	{#if foo}
 		<p>conditional</p>
-	{{/if}}
+	{/if}
 </Nested>
 
 <script>
diff --git a/test/runtime/samples/component-slot-if-else-block-before-node/main.html b/test/runtime/samples/component-slot-if-else-block-before-node/main.html
index 5057cc641e..52e923780a 100644
--- a/test/runtime/samples/component-slot-if-else-block-before-node/main.html
+++ b/test/runtime/samples/component-slot-if-else-block-before-node/main.html
@@ -1,9 +1,9 @@
 <Nested>
-	{{#if !enabled}}
+	{#if !enabled}
 		<p>disabled</p>
-	{{else}}
+	{:else}
 		<p>enabled</p>
-	{{/if}}
+	{/if}
 
 	<p>unconditional</p>
 </Nested>
diff --git a/test/runtime/samples/component-static-at-symbol/Email.html b/test/runtime/samples/component-static-at-symbol/Email.html
index 629ae71a04..f6b3b9f053 100644
--- a/test/runtime/samples/component-static-at-symbol/Email.html
+++ b/test/runtime/samples/component-static-at-symbol/Email.html
@@ -1 +1 @@
-<a href='mailto:{{address}}'>email</a>
+<a href='mailto:{address}'>email</a>
diff --git a/test/runtime/samples/component-yield-follows-element/Foo.html b/test/runtime/samples/component-yield-follows-element/Foo.html
index 1e619f2ecd..f2faab767e 100644
--- a/test/runtime/samples/component-yield-follows-element/Foo.html
+++ b/test/runtime/samples/component-yield-follows-element/Foo.html
@@ -1,2 +1,2 @@
 <div>before</div>
-{{yield}}
\ No newline at end of file
+<slot></slot>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-if/Widget.html b/test/runtime/samples/component-yield-if/Widget.html
index 31dba7d071..2649b132e4 100644
--- a/test/runtime/samples/component-yield-if/Widget.html
+++ b/test/runtime/samples/component-yield-if/Widget.html
@@ -1,7 +1,7 @@
 <p>
-	{{#if show}}
-		{{yield}}
-	{{/if}}
+	{#if show}
+		<slot></slot>
+	{/if}
 </p>
 
 <script>
diff --git a/test/runtime/samples/component-yield-if/main.html b/test/runtime/samples/component-yield-if/main.html
index c47e6de3c5..974865f61c 100644
--- a/test/runtime/samples/component-yield-if/main.html
+++ b/test/runtime/samples/component-yield-if/main.html
@@ -1,5 +1,5 @@
 <div>
-	<Widget ref:widget>{{data}}</Widget>
+	<Widget ref:widget>{data}</Widget>
 </div>
 
 <script>
diff --git a/test/runtime/samples/component-yield-multiple-in-each/Widget.html b/test/runtime/samples/component-yield-multiple-in-each/Widget.html
index e147954fa0..ca134c6130 100644
--- a/test/runtime/samples/component-yield-multiple-in-each/Widget.html
+++ b/test/runtime/samples/component-yield-multiple-in-each/Widget.html
@@ -1 +1 @@
-<p>{{yield}}</p>
+<p><slot></slot></p>
diff --git a/test/runtime/samples/component-yield-multiple-in-each/main.html b/test/runtime/samples/component-yield-multiple-in-each/main.html
index 149e98549c..efc4f382e3 100644
--- a/test/runtime/samples/component-yield-multiple-in-each/main.html
+++ b/test/runtime/samples/component-yield-multiple-in-each/main.html
@@ -1,6 +1,6 @@
-{{#each people as person}}
-	<Widget>Hello {{person}}</Widget>
-{{/each}}
+{#each people as person}
+	<Widget>Hello {person}</Widget>
+{/each}
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/component-yield-multiple-in-if/Widget.html b/test/runtime/samples/component-yield-multiple-in-if/Widget.html
index 2dddb1946f..0be5224893 100644
--- a/test/runtime/samples/component-yield-multiple-in-if/Widget.html
+++ b/test/runtime/samples/component-yield-multiple-in-if/Widget.html
@@ -1 +1 @@
-<p class='widget'>{{yield}}</p>
+<p class='widget'><slot></slot></p>
diff --git a/test/runtime/samples/component-yield-multiple-in-if/main.html b/test/runtime/samples/component-yield-multiple-in-if/main.html
index e1d380e647..d59276292f 100644
--- a/test/runtime/samples/component-yield-multiple-in-if/main.html
+++ b/test/runtime/samples/component-yield-multiple-in-if/main.html
@@ -1,9 +1,9 @@
 <div>
-	{{#if arriving}}
+	{#if arriving}
 		<Widget>Hello</Widget>
-	{{else}}
+	{:else}
 		<Widget>Goodbye</Widget>
-	{{/if}}
+	{/if}
 </div>
 
 <script>
diff --git a/test/runtime/samples/component-yield-nested-if/Outer.html b/test/runtime/samples/component-yield-nested-if/Outer.html
index c9557e4532..7a5960212a 100644
--- a/test/runtime/samples/component-yield-nested-if/Outer.html
+++ b/test/runtime/samples/component-yield-nested-if/Outer.html
@@ -1,3 +1,3 @@
-{{#if foo}}
-	{{yield}}
-{{/if}}
+{#if foo}
+	<slot></slot>
+{/if}
diff --git a/test/runtime/samples/component-yield-nested-if/main.html b/test/runtime/samples/component-yield-nested-if/main.html
index fbdaf0cb6f..36dff0028e 100644
--- a/test/runtime/samples/component-yield-nested-if/main.html
+++ b/test/runtime/samples/component-yield-nested-if/main.html
@@ -1,4 +1,4 @@
-<Outer :foo>
+<Outer {foo}>
 	One
 	<Inner/>
 </Outer>
diff --git a/test/runtime/samples/component-yield-parent/Widget.html b/test/runtime/samples/component-yield-parent/Widget.html
index e147954fa0..ca134c6130 100644
--- a/test/runtime/samples/component-yield-parent/Widget.html
+++ b/test/runtime/samples/component-yield-parent/Widget.html
@@ -1 +1 @@
-<p>{{yield}}</p>
+<p><slot></slot></p>
diff --git a/test/runtime/samples/component-yield-parent/main.html b/test/runtime/samples/component-yield-parent/main.html
index 8a043a6ca7..5b0a4b4f93 100644
--- a/test/runtime/samples/component-yield-parent/main.html
+++ b/test/runtime/samples/component-yield-parent/main.html
@@ -1,5 +1,5 @@
 <div>
-	<Widget>{{data}}</Widget>
+	<Widget>{data}</Widget>
 </div>
 <script>
 	import Widget from './Widget.html'
diff --git a/test/runtime/samples/component-yield-placement/Modal.html b/test/runtime/samples/component-yield-placement/Modal.html
index 0085a3ef7f..0da768c450 100644
--- a/test/runtime/samples/component-yield-placement/Modal.html
+++ b/test/runtime/samples/component-yield-placement/Modal.html
@@ -1,6 +1,6 @@
 <div class='modal-background' on:click='destroy()'></div>
 
 <div class='modal'>
-	{{yield}}
+	<slot></slot>
 	<button on:click='destroy()'>close modal</button>
 </div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-placement/main.html b/test/runtime/samples/component-yield-placement/main.html
index ac8366a9c7..cbcf697a4a 100644
--- a/test/runtime/samples/component-yield-placement/main.html
+++ b/test/runtime/samples/component-yield-placement/main.html
@@ -1,10 +1,10 @@
-{{#if showModal}}
+{#if showModal}
 	<Modal on:destroy='set({ showModal: false })'>
 		<h2>Hello!</h2>
 	</Modal>
-{{else}}
+{:else}
 	<button on:click='set({ showModal: true })'>show modal</button>
-{{/if}}
+{/if}
 
 <script>
 	import Modal from './Modal.html';
diff --git a/test/runtime/samples/component-yield-static/Widget.html b/test/runtime/samples/component-yield-static/Widget.html
index 25141c9254..26a00b9191 100644
--- a/test/runtime/samples/component-yield-static/Widget.html
+++ b/test/runtime/samples/component-yield-static/Widget.html
@@ -1 +1 @@
-<b>{{yield}}</b>
+<b><slot></slot></b>
diff --git a/test/runtime/samples/component-yield-static/main.html b/test/runtime/samples/component-yield-static/main.html
index 5e2fffc76a..a9ca474d58 100644
--- a/test/runtime/samples/component-yield-static/main.html
+++ b/test/runtime/samples/component-yield-static/main.html
@@ -1,4 +1,4 @@
-<Widget>Hello</Widget> {{name}}
+<Widget>Hello</Widget> {name}
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/component-yield/main.html b/test/runtime/samples/component-yield/main.html
index 5432dcf8f4..b8a5b648c5 100644
--- a/test/runtime/samples/component-yield/main.html
+++ b/test/runtime/samples/component-yield/main.html
@@ -1,8 +1,8 @@
 <p>
 	Hello
-	{{#if test}}
-		{{yield}}
-	{{/if}}
+	{#if test}
+		<slot></slot>
+	{/if}
 </p>
 
 <script>
diff --git a/test/runtime/samples/computed-function/main-v2.html b/test/runtime/samples/computed-function/main-v2.html
deleted file mode 100644
index a432252166..0000000000
--- a/test/runtime/samples/computed-function/main-v2.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<p>{scale(x)}</p>
-
-<script>
-	export default {
-		data: () => ({
-			x: 5,
-			domain: [ 0, 10 ],
-			range: [ 0, 100 ]
-		}),
-
-		computed: {
-			scale: ({ domain, range }) => {
-				return num => {
-					const t = domain[0] + ( num - domain[0] ) / ( domain[1] - domain[0] );
-					return range[0] + t * ( range[1] - range[0] );
-				}
-			}
-		}
-	};
-</script>
diff --git a/test/runtime/samples/computed-function/main.html b/test/runtime/samples/computed-function/main.html
index f3fc14727d..a432252166 100644
--- a/test/runtime/samples/computed-function/main.html
+++ b/test/runtime/samples/computed-function/main.html
@@ -1,4 +1,4 @@
-<p>{{scale(x)}}</p>
+<p>{scale(x)}</p>
 
 <script>
 	export default {
@@ -9,7 +9,7 @@
 		}),
 
 		computed: {
-			scale: ( domain, range ) => {
+			scale: ({ domain, range }) => {
 				return num => {
 					const t = domain[0] + ( num - domain[0] ) / ( domain[1] - domain[0] );
 					return range[0] + t * ( range[1] - range[0] );
diff --git a/test/runtime/samples/computed-values-deconflicted/main-v2.html b/test/runtime/samples/computed-values-deconflicted/main-v2.html
deleted file mode 100644
index e5a016084c..0000000000
--- a/test/runtime/samples/computed-values-deconflicted/main-v2.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<span>{state}</span>
-
-<script>
-	export default {
-		data() {
-			return {
-				x: 'waiting'
-			};
-		},
-		computed: {
-			state: ({ x }) => x
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/computed-values-deconflicted/main.html b/test/runtime/samples/computed-values-deconflicted/main.html
index d32fde6167..e5a016084c 100644
--- a/test/runtime/samples/computed-values-deconflicted/main.html
+++ b/test/runtime/samples/computed-values-deconflicted/main.html
@@ -1,4 +1,4 @@
-<span>{{state}}</span>
+<span>{state}</span>
 
 <script>
 	export default {
@@ -8,7 +8,7 @@
 			};
 		},
 		computed: {
-			state: x => x
+			state: ({ x }) => x
 		}
 	};
 </script>
\ No newline at end of file
diff --git a/test/runtime/samples/computed-values-default/main-v2.html b/test/runtime/samples/computed-values-default/main-v2.html
deleted file mode 100644
index b26762f3d8..0000000000
--- a/test/runtime/samples/computed-values-default/main-v2.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>{foo}</p>
-
-<script>
-	export default {
-		computed: {
-			foo: ({ a = 1 }) => a * 2
-		}
-	};
-</script>
diff --git a/test/runtime/samples/computed-values-default/main.html b/test/runtime/samples/computed-values-default/main.html
index 74292a3a2e..b26762f3d8 100644
--- a/test/runtime/samples/computed-values-default/main.html
+++ b/test/runtime/samples/computed-values-default/main.html
@@ -1,9 +1,9 @@
-<p>{{foo}}</p>
+<p>{foo}</p>
 
 <script>
 	export default {
 		computed: {
-			foo: ( a = 1 ) => a * 2
+			foo: ({ a = 1 }) => a * 2
 		}
 	};
 </script>
diff --git a/test/runtime/samples/computed-values-function-dependency/main-v2.html b/test/runtime/samples/computed-values-function-dependency/main-v2.html
deleted file mode 100644
index adf66137fa..0000000000
--- a/test/runtime/samples/computed-values-function-dependency/main-v2.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<p>{x}</p>
-
-<script>
-	let _x;
-
-	function getX () {
-		return _x;
-	}
-
-	export default {
-		data () {
-			return {
-				y: 1
-			};
-		},
-
-		computed: {
-			xGetter ({ y }) {
-				_x = y * 2;
-				return getX;
-			},
-
-			x ({ xGetter }) {
-				return xGetter();
-			}
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/computed-values-function-dependency/main.html b/test/runtime/samples/computed-values-function-dependency/main.html
index d385bf6da8..adf66137fa 100644
--- a/test/runtime/samples/computed-values-function-dependency/main.html
+++ b/test/runtime/samples/computed-values-function-dependency/main.html
@@ -1,4 +1,4 @@
-<p>{{x}}</p>
+<p>{x}</p>
 
 <script>
 	let _x;
@@ -15,12 +15,12 @@
 		},
 
 		computed: {
-			xGetter ( y ) {
+			xGetter ({ y }) {
 				_x = y * 2;
 				return getX;
 			},
 
-			x ( xGetter ) {
+			x ({ xGetter }) {
 				return xGetter();
 			}
 		}
diff --git a/test/runtime/samples/computed-values/main-v2.html b/test/runtime/samples/computed-values/main-v2.html
deleted file mode 100644
index 7e4f8d7728..0000000000
--- a/test/runtime/samples/computed-values/main-v2.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<p>{a} + {b} = {c}</p>
-<p>{c} * {c} = {cSquared}</p>
-
-<script>
-	export default {
-		data: () => ({
-			a: 1,
-			b: 2
-		}),
-
-		computed: {
-			c: ({ a, b }) => a + b,
-			cSquared: ({ c }) => c * c
-		}
-	};
-</script>
diff --git a/test/runtime/samples/computed-values/main.html b/test/runtime/samples/computed-values/main.html
index 0cee54f867..7e4f8d7728 100644
--- a/test/runtime/samples/computed-values/main.html
+++ b/test/runtime/samples/computed-values/main.html
@@ -1,5 +1,5 @@
-<p>{{a}} + {{b}} = {{c}}</p>
-<p>{{c}} * {{c}} = {{cSquared}}</p>
+<p>{a} + {b} = {c}</p>
+<p>{c} * {c} = {cSquared}</p>
 
 <script>
 	export default {
@@ -9,8 +9,8 @@
 		}),
 
 		computed: {
-			c: ( a, b ) => a + b,
-			cSquared: c => c * c
+			c: ({ a, b }) => a + b,
+			cSquared: ({ c }) => c * c
 		}
 	};
 </script>
diff --git a/test/runtime/samples/custom-method/main.html b/test/runtime/samples/custom-method/main.html
index 3bd8459fb1..0f1ad3387c 100644
--- a/test/runtime/samples/custom-method/main.html
+++ b/test/runtime/samples/custom-method/main.html
@@ -1,6 +1,6 @@
 <button on:click='add1()'>+1</button>
 
-<p>{{counter}}</p>
+<p>{counter}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/deconflict-builtins/main.html b/test/runtime/samples/deconflict-builtins/main.html
index db26b1ed70..4da19ce0c4 100644
--- a/test/runtime/samples/deconflict-builtins/main.html
+++ b/test/runtime/samples/deconflict-builtins/main.html
@@ -1,4 +1,4 @@
-<span>{{foo}}</span>
+<span>{foo}</span>
 
 <script>
 	import { get } from './get.js';
diff --git a/test/runtime/samples/deconflict-component-refs/main.html b/test/runtime/samples/deconflict-component-refs/main.html
index 78f0c26661..73a1af75c9 100644
--- a/test/runtime/samples/deconflict-component-refs/main.html
+++ b/test/runtime/samples/deconflict-component-refs/main.html
@@ -1,11 +1,11 @@
 <ul>
-	{{#each components as component}}
+	{#each components as component}
 		<li>
-			{{#if component.edit}}
+			{#if component.edit}
 				<input ref:name bind:value=component.name />
-			{{else}}
-				{{component.name}}
-			{{/if}}
+			{:else}
+				{component.name}
+			{/if}
 		</li>
-	{{/each}}
+	{/each}
 </ul>
\ No newline at end of file
diff --git a/test/runtime/samples/deconflict-contexts/main.html b/test/runtime/samples/deconflict-contexts/main.html
index b4bb745089..84cdb1bca0 100644
--- a/test/runtime/samples/deconflict-contexts/main.html
+++ b/test/runtime/samples/deconflict-contexts/main.html
@@ -1,5 +1,5 @@
 <ul>
-	{{#each components as component}}
-		<li>{{component}}</li>
-	{{/each}}
+	{#each components as component}
+		<li>{component}</li>
+	{/each}
 </ul>
\ No newline at end of file
diff --git a/test/runtime/samples/deconflict-elements-indexes/main.html b/test/runtime/samples/deconflict-elements-indexes/main.html
index 75a257747f..ce6de6b086 100644
--- a/test/runtime/samples/deconflict-elements-indexes/main.html
+++ b/test/runtime/samples/deconflict-elements-indexes/main.html
@@ -1,9 +1,9 @@
 <div>
-	{{#each tagList as tag, i}}
+	{#each tagList as tag, i}
 		<i on:click='remove(i)'>
-			{{tag}}
+			{tag}
 		</i>
-	{{/each}}
+	{/each}
 </div>
 
 <script>
diff --git a/test/runtime/samples/deconflict-non-helpers/main.html b/test/runtime/samples/deconflict-non-helpers/main.html
index 8541b090f9..d6ee1eaeae 100644
--- a/test/runtime/samples/deconflict-non-helpers/main.html
+++ b/test/runtime/samples/deconflict-non-helpers/main.html
@@ -1,4 +1,4 @@
-{{compute}}
+{compute}
 <script>
 	import { addCss, addedCss, applyComputations, renderMainFragment } from './module.js';
 
@@ -9,7 +9,7 @@
 			};
 		},
 		computed: {
-			compute: value => value.toUpperCase()
+			compute: ({ value }) => value.toUpperCase()
 		}
 	};
 </script>
diff --git a/test/runtime/samples/deconflict-template-1/main.html b/test/runtime/samples/deconflict-template-1/main.html
index f4fe8de423..395d7b22b3 100644
--- a/test/runtime/samples/deconflict-template-1/main.html
+++ b/test/runtime/samples/deconflict-template-1/main.html
@@ -1,4 +1,4 @@
-{{value}}
+{value}
 
 <script>
 	import { template } from './module.js';
diff --git a/test/runtime/samples/deconflict-template-2/main.html b/test/runtime/samples/deconflict-template-2/main.html
index 34994a335b..79f76724ed 100644
--- a/test/runtime/samples/deconflict-template-2/main.html
+++ b/test/runtime/samples/deconflict-template-2/main.html
@@ -1,4 +1,4 @@
-{{value}}
+{value}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/deconflict-vars/main.html b/test/runtime/samples/deconflict-vars/main.html
index 5f96bf932c..ed2cd6c4a9 100644
--- a/test/runtime/samples/deconflict-vars/main.html
+++ b/test/runtime/samples/deconflict-vars/main.html
@@ -1,4 +1,4 @@
-<p>{{value}}</p>
+<p>{value}</p>
 
 <script>
 	function throwError() {
diff --git a/test/runtime/samples/default-data-function/main.html b/test/runtime/samples/default-data-function/main.html
index aed9952b39..5225b6c3cd 100644
--- a/test/runtime/samples/default-data-function/main.html
+++ b/test/runtime/samples/default-data-function/main.html
@@ -1,4 +1,4 @@
-<h1>Hello {{name()}}!</h1>
+<h1>Hello {name()}!</h1>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/default-data-override/main.html b/test/runtime/samples/default-data-override/main.html
index e46cedc667..afd9e23a73 100644
--- a/test/runtime/samples/default-data-override/main.html
+++ b/test/runtime/samples/default-data-override/main.html
@@ -1,4 +1,4 @@
-<h1>Hello {{name}}!</h1>
+<h1>Hello {name}!</h1>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/default-data/main.html b/test/runtime/samples/default-data/main.html
index e46cedc667..afd9e23a73 100644
--- a/test/runtime/samples/default-data/main.html
+++ b/test/runtime/samples/default-data/main.html
@@ -1,4 +1,4 @@
-<h1>Hello {{name}}!</h1>
+<h1>Hello {name}!</h1>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/dev-warning-dynamic-components-misplaced/main-v2.html b/test/runtime/samples/dev-warning-dynamic-components-misplaced/main-v2.html
deleted file mode 100644
index eb6e7d8e8e..0000000000
--- a/test/runtime/samples/dev-warning-dynamic-components-misplaced/main-v2.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<svelte:component this="{x ? Foo : Bar}"/>
-
-<script>
-	import Foo from './Foo.html';
-	import Bar from './Bar.html';
-
-	export default {
-		components: {
-			Foo,
-			Bar
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html b/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html
index 37392f27e6..eb6e7d8e8e 100644
--- a/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html
+++ b/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html
@@ -1,4 +1,4 @@
-<:Component {x ? Foo : Bar}/>
+<svelte:component this="{x ? Foo : Bar}"/>
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/dev-warning-helper/main.html b/test/runtime/samples/dev-warning-helper/main.html
index f86e8fb09c..07d261a81d 100644
--- a/test/runtime/samples/dev-warning-helper/main.html
+++ b/test/runtime/samples/dev-warning-helper/main.html
@@ -1,4 +1,4 @@
-{{foo(bar)}}
+{foo(bar)}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/dev-warning-missing-data/main.html b/test/runtime/samples/dev-warning-missing-data/main.html
index f2b243bada..4efe809843 100644
--- a/test/runtime/samples/dev-warning-missing-data/main.html
+++ b/test/runtime/samples/dev-warning-missing-data/main.html
@@ -1,4 +1,4 @@
 <p>
-	{{Math.max(0, foo)}}
-	{{bar}}
+	{Math.max(0, foo)}
+	{bar}
 </p>
diff --git a/test/runtime/samples/dev-warning-readonly-computed/main.html b/test/runtime/samples/dev-warning-readonly-computed/main.html
index d6bb5eb81c..199aac1a9c 100644
--- a/test/runtime/samples/dev-warning-readonly-computed/main.html
+++ b/test/runtime/samples/dev-warning-readonly-computed/main.html
@@ -1,7 +1,7 @@
 <script>
 	export default {
 		computed: {
-			foo: a => a + 1
+			foo: ({ a }) => a + 1
 		}
 	};
 </script>
\ No newline at end of file
diff --git a/test/runtime/samples/dev-warning-readonly-window-binding/main-v2.html b/test/runtime/samples/dev-warning-readonly-window-binding/main-v2.html
deleted file mode 100644
index 87b0403ee3..0000000000
--- a/test/runtime/samples/dev-warning-readonly-window-binding/main-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<svelte:window bind:innerWidth='width'/>
\ No newline at end of file
diff --git a/test/runtime/samples/dev-warning-readonly-window-binding/main.html b/test/runtime/samples/dev-warning-readonly-window-binding/main.html
index 635ae75e9c..87b0403ee3 100644
--- a/test/runtime/samples/dev-warning-readonly-window-binding/main.html
+++ b/test/runtime/samples/dev-warning-readonly-window-binding/main.html
@@ -1 +1 @@
-<:Window bind:innerWidth='width'/>
\ No newline at end of file
+<svelte:window bind:innerWidth='width'/>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/Green-v2.html b/test/runtime/samples/dynamic-component-bindings-recreated/Green-v2.html
deleted file mode 100644
index b4faa1b662..0000000000
--- a/test/runtime/samples/dynamic-component-bindings-recreated/Green-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>green {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/Green.html b/test/runtime/samples/dynamic-component-bindings-recreated/Green.html
index 692847c1c2..b4faa1b662 100644
--- a/test/runtime/samples/dynamic-component-bindings-recreated/Green.html
+++ b/test/runtime/samples/dynamic-component-bindings-recreated/Green.html
@@ -1 +1 @@
-<p>green {{foo}}</p>
\ No newline at end of file
+<p>green {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/Red-v2.html b/test/runtime/samples/dynamic-component-bindings-recreated/Red-v2.html
deleted file mode 100644
index a3e3c792a0..0000000000
--- a/test/runtime/samples/dynamic-component-bindings-recreated/Red-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>red {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/Red.html b/test/runtime/samples/dynamic-component-bindings-recreated/Red.html
index 8f10e3294d..a3e3c792a0 100644
--- a/test/runtime/samples/dynamic-component-bindings-recreated/Red.html
+++ b/test/runtime/samples/dynamic-component-bindings-recreated/Red.html
@@ -1 +1 @@
-<p>red {{foo}}</p>
\ No newline at end of file
+<p>red {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/main-v2.html b/test/runtime/samples/dynamic-component-bindings-recreated/main-v2.html
deleted file mode 100644
index 6d748ed217..0000000000
--- a/test/runtime/samples/dynamic-component-bindings-recreated/main-v2.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<svelte:component this="{x ? Green : Red}" bind:foo />
-
-<script>
-	import Green from './Green-v2.html';
-	import Red from './Red-v2.html';
-
-	export default {
-		data() {
-			return {
-				Green,
-				Red
-			};
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/main.html b/test/runtime/samples/dynamic-component-bindings-recreated/main.html
index b9cdf92660..a26c1cd080 100644
--- a/test/runtime/samples/dynamic-component-bindings-recreated/main.html
+++ b/test/runtime/samples/dynamic-component-bindings-recreated/main.html
@@ -1,4 +1,4 @@
-<:Component {x ? Green : Red} bind:foo />
+<svelte:component this="{x ? Green : Red}" bind:foo />
 
 <script>
 	import Green from './Green.html';
diff --git a/test/runtime/samples/dynamic-component-bindings/main-v2.html b/test/runtime/samples/dynamic-component-bindings/main-v2.html
deleted file mode 100644
index 020855cb22..0000000000
--- a/test/runtime/samples/dynamic-component-bindings/main-v2.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<svelte:component this="{ x ? Foo : Bar }" bind:y bind:z/>
-
-<script>
-	import Foo from './Foo.html';
-	import Bar from './Bar.html';
-
-	export default {
-		data() {
-			return { Foo, Bar };
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings/main.html b/test/runtime/samples/dynamic-component-bindings/main.html
index cb260da71f..020855cb22 100644
--- a/test/runtime/samples/dynamic-component-bindings/main.html
+++ b/test/runtime/samples/dynamic-component-bindings/main.html
@@ -1,4 +1,4 @@
-<:Component { x ? Foo : Bar } bind:y bind:z/>
+<svelte:component this="{ x ? Foo : Bar }" bind:y bind:z/>
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/dynamic-component-events/main-v2.html b/test/runtime/samples/dynamic-component-events/main-v2.html
deleted file mode 100644
index 5fa66b2c61..0000000000
--- a/test/runtime/samples/dynamic-component-events/main-v2.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<svelte:component this="{ x ? Foo : Bar }" on:select='set({ selected: event.id })'/>
-
-<script>
-	import Foo from './Foo.html';
-	import Bar from './Bar.html';
-
-	export default {
-		data() {
-			return { Foo, Bar };
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-events/main.html b/test/runtime/samples/dynamic-component-events/main.html
index 8606b56ce0..5fa66b2c61 100644
--- a/test/runtime/samples/dynamic-component-events/main.html
+++ b/test/runtime/samples/dynamic-component-events/main.html
@@ -1,4 +1,4 @@
-<:Component { x ? Foo : Bar } on:select='set({ selected: event.id })'/>
+<svelte:component this="{ x ? Foo : Bar }" on:select='set({ selected: event.id })'/>
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/dynamic-component-inside-element/Bar-v2.html b/test/runtime/samples/dynamic-component-inside-element/Bar-v2.html
deleted file mode 100644
index 79e01b851c..0000000000
--- a/test/runtime/samples/dynamic-component-inside-element/Bar-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>{x}, therefore Bar</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-inside-element/Bar.html b/test/runtime/samples/dynamic-component-inside-element/Bar.html
index 7c21e68c89..79e01b851c 100644
--- a/test/runtime/samples/dynamic-component-inside-element/Bar.html
+++ b/test/runtime/samples/dynamic-component-inside-element/Bar.html
@@ -1 +1 @@
-<p>{{x}}, therefore Bar</p>
\ No newline at end of file
+<p>{x}, therefore Bar</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-inside-element/Foo-v2.html b/test/runtime/samples/dynamic-component-inside-element/Foo-v2.html
deleted file mode 100644
index cb35cfc082..0000000000
--- a/test/runtime/samples/dynamic-component-inside-element/Foo-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>{x}, therefore Foo</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-inside-element/Foo.html b/test/runtime/samples/dynamic-component-inside-element/Foo.html
index 2303a92c0a..cb35cfc082 100644
--- a/test/runtime/samples/dynamic-component-inside-element/Foo.html
+++ b/test/runtime/samples/dynamic-component-inside-element/Foo.html
@@ -1 +1 @@
-<p>{{x}}, therefore Foo</p>
\ No newline at end of file
+<p>{x}, therefore Foo</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-inside-element/main-v2.html b/test/runtime/samples/dynamic-component-inside-element/main-v2.html
deleted file mode 100644
index e889f2feb0..0000000000
--- a/test/runtime/samples/dynamic-component-inside-element/main-v2.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div>
-	<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
-</div>
-
-<script>
-	import Foo from './Foo-v2.html';
-	import Bar from './Bar-v2.html';
-
-	export default {
-		data() {
-			return { Foo, Bar };
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-inside-element/main.html b/test/runtime/samples/dynamic-component-inside-element/main.html
index 2f2eb26587..0844346301 100644
--- a/test/runtime/samples/dynamic-component-inside-element/main.html
+++ b/test/runtime/samples/dynamic-component-inside-element/main.html
@@ -1,5 +1,5 @@
 <div>
-	<:Component { x ? Foo : Bar } x='{{x}}'/>
+	<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
 </div>
 
 <script>
diff --git a/test/runtime/samples/dynamic-component-ref/main-v2.html b/test/runtime/samples/dynamic-component-ref/main-v2.html
deleted file mode 100644
index 1d54b17299..0000000000
--- a/test/runtime/samples/dynamic-component-ref/main-v2.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<svelte:component this={foo} ref:test/>
-
-<script>
-	import Foo from './Foo.html';
-
-	export default {
-		data() {
-			return { foo: Foo };
-		}
-	};
-</script>
diff --git a/test/runtime/samples/dynamic-component-ref/main.html b/test/runtime/samples/dynamic-component-ref/main.html
index ff506517bc..1d54b17299 100644
--- a/test/runtime/samples/dynamic-component-ref/main.html
+++ b/test/runtime/samples/dynamic-component-ref/main.html
@@ -1,4 +1,4 @@
-<:Component {foo} ref:test/>
+<svelte:component this={foo} ref:test/>
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/dynamic-component-slot/main-v2.html b/test/runtime/samples/dynamic-component-slot/main-v2.html
deleted file mode 100644
index e8b5c487ad..0000000000
--- a/test/runtime/samples/dynamic-component-slot/main-v2.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<svelte:component this="{ x ? Foo : Bar }" x='{x}'>
-	<p>element</p>
-
-	{tag}
-
-	{#if foo}
-		<p>foo</p>
-	{:elseif bar}
-		<p>bar</p>
-	{:else}
-		<p>neither foo nor bar</p>
-	{/if}
-
-	text
-
-	{#each things as thing}
-		<span>{thing}</span>
-	{/each}
-
-	<Baz/>
-
-	<div slot='other'>what goes up must come down</div>
-</svelte:component>
-
-<script>
-	import Foo from './Foo.html';
-	import Bar from './Bar.html';
-	import Baz from './Baz.html';
-
-	export default {
-		data() {
-			return {
-				Foo,
-				Bar,
-
-				tag: 'you\'re it',
-				things: ['a', 'b', 'c']
-			};
-		},
-
-		components: {
-			Baz
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-slot/main.html b/test/runtime/samples/dynamic-component-slot/main.html
index fd4fad1369..e8b5c487ad 100644
--- a/test/runtime/samples/dynamic-component-slot/main.html
+++ b/test/runtime/samples/dynamic-component-slot/main.html
@@ -1,26 +1,26 @@
-<:Component { x ? Foo : Bar } x='{{x}}'>
+<svelte:component this="{ x ? Foo : Bar }" x='{x}'>
 	<p>element</p>
 
-	{{tag}}
+	{tag}
 
-	{{#if foo}}
+	{#if foo}
 		<p>foo</p>
-	{{elseif bar}}
+	{:elseif bar}
 		<p>bar</p>
-	{{else}}
+	{:else}
 		<p>neither foo nor bar</p>
-	{{/if}}
+	{/if}
 
 	text
 
-	{{#each things as thing}}
-		<span>{{thing}}</span>
-	{{/each}}
+	{#each things as thing}
+		<span>{thing}</span>
+	{/each}
 
 	<Baz/>
 
 	<div slot='other'>what goes up must come down</div>
-</:Component>
+</svelte:component>
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/Bar-v2.html b/test/runtime/samples/dynamic-component-update-existing-instance/Bar-v2.html
deleted file mode 100644
index 36fa195dcd..0000000000
--- a/test/runtime/samples/dynamic-component-update-existing-instance/Bar-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>Bar {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/Bar.html b/test/runtime/samples/dynamic-component-update-existing-instance/Bar.html
index 80328a2e8a..36fa195dcd 100644
--- a/test/runtime/samples/dynamic-component-update-existing-instance/Bar.html
+++ b/test/runtime/samples/dynamic-component-update-existing-instance/Bar.html
@@ -1 +1 @@
-<p>Bar {{x}}</p>
\ No newline at end of file
+<p>Bar {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/Foo-v2.html b/test/runtime/samples/dynamic-component-update-existing-instance/Foo-v2.html
deleted file mode 100644
index 0a9cd0047a..0000000000
--- a/test/runtime/samples/dynamic-component-update-existing-instance/Foo-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>Foo {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/Foo.html b/test/runtime/samples/dynamic-component-update-existing-instance/Foo.html
index fcb10c0f99..0a9cd0047a 100644
--- a/test/runtime/samples/dynamic-component-update-existing-instance/Foo.html
+++ b/test/runtime/samples/dynamic-component-update-existing-instance/Foo.html
@@ -1 +1 @@
-<p>Foo {{x}}</p>
\ No newline at end of file
+<p>Foo {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/main-v2.html b/test/runtime/samples/dynamic-component-update-existing-instance/main-v2.html
deleted file mode 100644
index 4bdf36f529..0000000000
--- a/test/runtime/samples/dynamic-component-update-existing-instance/main-v2.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
-
-<script>
-	import Foo from './Foo-v2.html';
-	import Bar from './Bar-v2.html';
-
-	export default {
-		data() {
-			return { Foo, Bar };
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/main.html b/test/runtime/samples/dynamic-component-update-existing-instance/main.html
index 127c189cc3..1f8bd35f8c 100644
--- a/test/runtime/samples/dynamic-component-update-existing-instance/main.html
+++ b/test/runtime/samples/dynamic-component-update-existing-instance/main.html
@@ -1,4 +1,4 @@
-<:Component { x ? Foo : Bar } x='{{x}}'/>
+<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/dynamic-component/Bar.html b/test/runtime/samples/dynamic-component/Bar.html
index 7c21e68c89..79e01b851c 100644
--- a/test/runtime/samples/dynamic-component/Bar.html
+++ b/test/runtime/samples/dynamic-component/Bar.html
@@ -1 +1 @@
-<p>{{x}}, therefore Bar</p>
\ No newline at end of file
+<p>{x}, therefore Bar</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component/Foo.html b/test/runtime/samples/dynamic-component/Foo.html
index 2303a92c0a..cb35cfc082 100644
--- a/test/runtime/samples/dynamic-component/Foo.html
+++ b/test/runtime/samples/dynamic-component/Foo.html
@@ -1 +1 @@
-<p>{{x}}, therefore Foo</p>
\ No newline at end of file
+<p>{x}, therefore Foo</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component/main.html b/test/runtime/samples/dynamic-component/main.html
index 127c189cc3..1f8bd35f8c 100644
--- a/test/runtime/samples/dynamic-component/main.html
+++ b/test/runtime/samples/dynamic-component/main.html
@@ -1,4 +1,4 @@
-<:Component { x ? Foo : Bar } x='{{x}}'/>
+<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/each-block-array-literal/main.html b/test/runtime/samples/each-block-array-literal/main.html
index 8c55e94612..f58a2fa99b 100644
--- a/test/runtime/samples/each-block-array-literal/main.html
+++ b/test/runtime/samples/each-block-array-literal/main.html
@@ -1,6 +1,6 @@
-{{#each ['racoon', 'eagle'] as animal}}
-	<button on:click="set({clicked: animal})">{{animal}}</button>
-{{/each}}
+{#each ['racoon', 'eagle'] as animal}
+	<button on:click="set({clicked: animal})">{animal}</button>
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/each-block-containing-component-in-if/Nested.html b/test/runtime/samples/each-block-containing-component-in-if/Nested.html
index b9d76a696d..0ceac58d9c 100644
--- a/test/runtime/samples/each-block-containing-component-in-if/Nested.html
+++ b/test/runtime/samples/each-block-containing-component-in-if/Nested.html
@@ -1,5 +1,5 @@
-{{#if show}}
-	{{#each fields as field}}
-		<span>{{field}}</span>
-	{{/each}}
-{{/if}}
\ No newline at end of file
+{#if show}
+	{#each fields as field}
+		<span>{field}</span>
+	{/each}
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-containing-component-in-if/main.html b/test/runtime/samples/each-block-containing-component-in-if/main.html
index 9a6bbfd10f..cf81af277d 100644
--- a/test/runtime/samples/each-block-containing-component-in-if/main.html
+++ b/test/runtime/samples/each-block-containing-component-in-if/main.html
@@ -1,5 +1,5 @@
 <div>
-	<Nested :show :fields/>
+	<Nested {show} {fields}/>
 </div>
 
 <script>
diff --git a/test/runtime/samples/each-block-containing-if/main.html b/test/runtime/samples/each-block-containing-if/main.html
index 0d9fc2e8a2..72fbdc576e 100644
--- a/test/runtime/samples/each-block-containing-if/main.html
+++ b/test/runtime/samples/each-block-containing-if/main.html
@@ -1,9 +1,9 @@
 <ul>
-	{{#each items as item}}
-		{{#if filter(item, currentFilter)}}
-			<li>{{item.description}}</li>
-		{{/if}}
-	{{/each}}
+	{#each items as item}
+		{#if filter(item, currentFilter)}
+			<li>{item.description}</li>
+		{/if}
+	{/each}
 </ul>
 
 <script>
diff --git a/test/runtime/samples/each-block-deconflict-name-context/main.html b/test/runtime/samples/each-block-deconflict-name-context/main.html
index 08730e1e01..2e634cfc01 100644
--- a/test/runtime/samples/each-block-deconflict-name-context/main.html
+++ b/test/runtime/samples/each-block-deconflict-name-context/main.html
@@ -1,3 +1,3 @@
-{{#each foo.bar as bar}}
+{#each foo.bar as bar}
 	<input bind:value='bar'>
-{{/each}}
+{/each}
diff --git a/test/runtime/samples/each-block-destructured-array/main.html b/test/runtime/samples/each-block-destructured-array/main.html
index 6ee90537ab..bf70195880 100644
--- a/test/runtime/samples/each-block-destructured-array/main.html
+++ b/test/runtime/samples/each-block-destructured-array/main.html
@@ -1,3 +1,3 @@
-{{#each animalPawsEntries as [animal, pawType]}}
-	<p>{{animal}}: {{pawType}}</p>
-{{/each}}
+{#each animalPawsEntries as [animal, pawType]}
+	<p>{animal}: {pawType}</p>
+{/each}
diff --git a/test/runtime/samples/each-block-dynamic-else-static/main.html b/test/runtime/samples/each-block-dynamic-else-static/main.html
index edd88f4705..86245d2486 100644
--- a/test/runtime/samples/each-block-dynamic-else-static/main.html
+++ b/test/runtime/samples/each-block-dynamic-else-static/main.html
@@ -1,5 +1,5 @@
-{{#each animals as animal}}
-	<p>{{animal}}</p>
-{{else}}
+{#each animals as animal}
+	<p>{animal}</p>
+{:else}
 	<p>no animals</p>
-{{/each}}
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-else-starts-empty/main.html b/test/runtime/samples/each-block-else-starts-empty/main.html
index 6c13e5fb23..c202670ed5 100644
--- a/test/runtime/samples/each-block-else-starts-empty/main.html
+++ b/test/runtime/samples/each-block-else-starts-empty/main.html
@@ -1,7 +1,7 @@
 before
-{{#each animals as animal}}
-	<p>{{animal}}</p>
-{{else}}
-	<p>no animals, but rather {{foo}}</p>
-{{/each}}
+{#each animals as animal}
+	<p>{animal}</p>
+{:else}
+	<p>no animals, but rather {foo}</p>
+{/each}
 after
diff --git a/test/runtime/samples/each-block-else/main.html b/test/runtime/samples/each-block-else/main.html
index 6c13e5fb23..c202670ed5 100644
--- a/test/runtime/samples/each-block-else/main.html
+++ b/test/runtime/samples/each-block-else/main.html
@@ -1,7 +1,7 @@
 before
-{{#each animals as animal}}
-	<p>{{animal}}</p>
-{{else}}
-	<p>no animals, but rather {{foo}}</p>
-{{/each}}
+{#each animals as animal}
+	<p>{animal}</p>
+{:else}
+	<p>no animals, but rather {foo}</p>
+{/each}
 after
diff --git a/test/runtime/samples/each-block-indexed/main.html b/test/runtime/samples/each-block-indexed/main.html
index 5c1c74da66..d5602ec82c 100644
--- a/test/runtime/samples/each-block-indexed/main.html
+++ b/test/runtime/samples/each-block-indexed/main.html
@@ -1,3 +1,3 @@
-{{#each animals as animal, i}}
-	<p>{{i}}: {{animal}}</p>
-{{/each}}
+{#each animals as animal, i}
+	<p>{i}: {animal}</p>
+{/each}
diff --git a/test/runtime/samples/each-block-keyed-dynamic/main.html b/test/runtime/samples/each-block-keyed-dynamic/main.html
index 7d5b90a9f8..cc5f25a0ef 100644
--- a/test/runtime/samples/each-block-keyed-dynamic/main.html
+++ b/test/runtime/samples/each-block-keyed-dynamic/main.html
@@ -1,3 +1,3 @@
-{{#each todos as todo @id}}
-	<p>{{todo.description}}</p>
-{{/each}}
+{#each todos as todo (todo.id)}
+	<p>{todo.description}</p>
+{/each}
diff --git a/test/runtime/samples/each-block-keyed-empty/main.html b/test/runtime/samples/each-block-keyed-empty/main.html
index f6610ae2c7..1d45aefa53 100644
--- a/test/runtime/samples/each-block-keyed-empty/main.html
+++ b/test/runtime/samples/each-block-keyed-empty/main.html
@@ -1 +1 @@
-{{#each x as y @z}}{{/each}}
+{#each x as y (y.z)}{/each}
diff --git a/test/runtime/samples/each-block-keyed-random-permute/main.html b/test/runtime/samples/each-block-keyed-random-permute/main.html
index a6aa4b621d..1dc93d9fa6 100644
--- a/test/runtime/samples/each-block-keyed-random-permute/main.html
+++ b/test/runtime/samples/each-block-keyed-random-permute/main.html
@@ -1,3 +1,3 @@
-{{#each values as value @id}}
-	({{value.id}})
-{{/each}}
+{#each values as value (value.id)}
+	({value.id})
+{/each}
diff --git a/test/runtime/samples/each-block-keyed-siblings/main.html b/test/runtime/samples/each-block-keyed-siblings/main.html
index d26a1944db..575f0f2d93 100644
--- a/test/runtime/samples/each-block-keyed-siblings/main.html
+++ b/test/runtime/samples/each-block-keyed-siblings/main.html
@@ -1,7 +1,7 @@
-{{#each ones as one @text}}
-	<div>{{one.text}}</div>
-{{/each}}
+{#each ones as one (one.text)}
+	<div>{one.text}</div>
+{/each}
 
-{{#each twos as two @text}}
-	<div>{{two.text}}</div>
-{{/each}}
\ No newline at end of file
+{#each twos as two (two.text)}
+	<div>{two.text}</div>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-keyed-static/main.html b/test/runtime/samples/each-block-keyed-static/main.html
index d9180cba65..fa1b853d16 100644
--- a/test/runtime/samples/each-block-keyed-static/main.html
+++ b/test/runtime/samples/each-block-keyed-static/main.html
@@ -1,3 +1,3 @@
-{{#each x as y @z}}
+{#each x as y (y.z)}
 	<p>does not change</p>
-{{/each}}
+{/each}
diff --git a/test/runtime/samples/each-block-keyed-unshift/Nested.html b/test/runtime/samples/each-block-keyed-unshift/Nested.html
index 53ccc03d4a..4e9905910b 100644
--- a/test/runtime/samples/each-block-keyed-unshift/Nested.html
+++ b/test/runtime/samples/each-block-keyed-unshift/Nested.html
@@ -1 +1 @@
-<p>{{title}}</p>
\ No newline at end of file
+<p>{title}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-keyed-unshift/main.html b/test/runtime/samples/each-block-keyed-unshift/main.html
index 854e77ae6f..885e12aeb8 100644
--- a/test/runtime/samples/each-block-keyed-unshift/main.html
+++ b/test/runtime/samples/each-block-keyed-unshift/main.html
@@ -1,6 +1,6 @@
-{{#each titles as title @name}}
-	<Nested title="{{title.name}}"/>
-{{/each}}
+{#each titles as title (title.name)}
+	<Nested title="{title.name}"/>
+{/each}
 
 <script>
 	import Nested from './Nested.html';
diff --git a/test/runtime/samples/each-block-keyed/main-v2.html b/test/runtime/samples/each-block-keyed/main-v2.html
deleted file mode 100644
index 3be42ebc77..0000000000
--- a/test/runtime/samples/each-block-keyed/main-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{#each todos as todo, i (todo.id)}
-	<p>{i+1}: {todo.description}</p>
-{/each}
diff --git a/test/runtime/samples/each-block-keyed/main.html b/test/runtime/samples/each-block-keyed/main.html
index da74eaa701..3be42ebc77 100644
--- a/test/runtime/samples/each-block-keyed/main.html
+++ b/test/runtime/samples/each-block-keyed/main.html
@@ -1,3 +1,3 @@
-{{#each todos as todo, i @id}}
-	<p>{{i+1}}: {{todo.description}}</p>
-{{/each}}
+{#each todos as todo, i (todo.id)}
+	<p>{i+1}: {todo.description}</p>
+{/each}
diff --git a/test/runtime/samples/each-block-random-permute/main.html b/test/runtime/samples/each-block-random-permute/main.html
index 8aef076d0e..310003c701 100644
--- a/test/runtime/samples/each-block-random-permute/main.html
+++ b/test/runtime/samples/each-block-random-permute/main.html
@@ -1,3 +1,3 @@
-{{#each values as value}}
-	({{value}})
-{{/each}}
+{#each values as value}
+	({value})
+{/each}
diff --git a/test/runtime/samples/each-block-static/main.html b/test/runtime/samples/each-block-static/main.html
index e74cb7bb74..b10d2d4fe6 100644
--- a/test/runtime/samples/each-block-static/main.html
+++ b/test/runtime/samples/each-block-static/main.html
@@ -1,3 +1,3 @@
-{{#each items as item}}
+{#each items as item}
 	foo
-{{/each}}
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-text-node/main.html b/test/runtime/samples/each-block-text-node/main.html
index c053271fa1..a25b53ed35 100644
--- a/test/runtime/samples/each-block-text-node/main.html
+++ b/test/runtime/samples/each-block-text-node/main.html
@@ -1,3 +1,3 @@
-{{#each animals as animal}}
-	({{animal}})
-{{/each}}
+{#each animals as animal}
+	({animal})
+{/each}
diff --git a/test/runtime/samples/each-block/main.html b/test/runtime/samples/each-block/main.html
index 23bfc3c465..83a5e88ddd 100644
--- a/test/runtime/samples/each-block/main.html
+++ b/test/runtime/samples/each-block/main.html
@@ -1,3 +1,3 @@
-{{#each animals as animal}}
-	<p>{{animal}}</p>
-{{/each}}
+{#each animals as animal}
+	<p>{animal}</p>
+{/each}
diff --git a/test/runtime/samples/each-blocks-expression/main.html b/test/runtime/samples/each-blocks-expression/main.html
index 8338e747f5..7079d86c1c 100644
--- a/test/runtime/samples/each-blocks-expression/main.html
+++ b/test/runtime/samples/each-blocks-expression/main.html
@@ -1,3 +1,3 @@
-{{#each [ 'a', 'b', 'c' ] as letter}}
-	<p>{{letter}}</p>
-{{/each}}
+{#each [ 'a', 'b', 'c' ] as letter}
+	<p>{letter}</p>
+{/each}
diff --git a/test/runtime/samples/each-blocks-nested-b/main.html b/test/runtime/samples/each-blocks-nested-b/main.html
index 2ebbd71c7c..3e9acfe986 100644
--- a/test/runtime/samples/each-blocks-nested-b/main.html
+++ b/test/runtime/samples/each-blocks-nested-b/main.html
@@ -1,5 +1,5 @@
-{{#each categories as category}}
-	{{#each category.things as thing}}
-		<p>{{category.name}}: {{thing.name}}</p>
-	{{/each}}
-{{/each}}
+{#each categories as category}
+	{#each category.things as thing}
+		<p>{category.name}: {thing.name}</p>
+	{/each}
+{/each}
diff --git a/test/runtime/samples/each-blocks-nested/main.html b/test/runtime/samples/each-blocks-nested/main.html
index 7725edb301..004bfcbca9 100644
--- a/test/runtime/samples/each-blocks-nested/main.html
+++ b/test/runtime/samples/each-blocks-nested/main.html
@@ -1,5 +1,5 @@
-{{#each columns as x}}
-	{{#each rows as y}}
-		<div>{{x}}, {{y}}</div>
-	{{/each}}
-{{/each}}
+{#each columns as x}
+	{#each rows as y}
+		<div>{x}, {y}</div>
+	{/each}
+{/each}
diff --git a/test/runtime/samples/escape-template-literals/Widget.html b/test/runtime/samples/escape-template-literals/Widget.html
index f0136f9405..5964bdac68 100644
--- a/test/runtime/samples/escape-template-literals/Widget.html
+++ b/test/runtime/samples/escape-template-literals/Widget.html
@@ -1 +1 @@
-<div>{{value}}</div>
+<div>{value}</div>
diff --git a/test/runtime/samples/escape-template-literals/main.html b/test/runtime/samples/escape-template-literals/main.html
index 138b390cfa..69dca26c65 100644
--- a/test/runtime/samples/escape-template-literals/main.html
+++ b/test/runtime/samples/escape-template-literals/main.html
@@ -1,6 +1,6 @@
-<code>`${foo}\n`</code>
-<div title="`${foo}\n`">foo</div>
-<Widget value="`${foo}\n`"/>
+<code>`$&#123;foo}\n`</code>
+<div title="`$&#123;foo}\n`">foo</div>
+<Widget value="`$&#123;foo}\n`"/>
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/event-handler-custom-context/main.html b/test/runtime/samples/event-handler-custom-context/main.html
index 90e5a4c72e..dd16947f29 100644
--- a/test/runtime/samples/event-handler-custom-context/main.html
+++ b/test/runtime/samples/event-handler-custom-context/main.html
@@ -1,4 +1,4 @@
-<button on:tap='set({ z: event.answer })'>{{z}}</button>
+<button on:tap='set({ z: event.answer })'>{z}</button>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/event-handler-custom-each-destructured/main.html b/test/runtime/samples/event-handler-custom-each-destructured/main.html
index ae9251269d..3b75c187f4 100644
--- a/test/runtime/samples/event-handler-custom-each-destructured/main.html
+++ b/test/runtime/samples/event-handler-custom-each-destructured/main.html
@@ -1,11 +1,11 @@
-{{#each items as [item0, item1]}}
+{#each items as [item0, item1]}
 	<button on:tap='set({ first: item0, second: item1 })'>
-		{{item0}}: {{item1}}
+		{item0}: {item1}
 	</button>
-{{/each}}
+{/each}
 
-<p>first: {{first}}</p>
-<p>second: {{second}}</p>
+<p>first: {first}</p>
+<p>second: {second}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/event-handler-custom-each/main.html b/test/runtime/samples/event-handler-custom-each/main.html
index 309e5c96ee..be92ec4d52 100644
--- a/test/runtime/samples/event-handler-custom-each/main.html
+++ b/test/runtime/samples/event-handler-custom-each/main.html
@@ -1,9 +1,9 @@
-{{#each items as item}}
-	<button on:tap='set({ fromDom: this.textContent, fromState: item })'>{{item}}</button>
-{{/each}}
+{#each items as item}
+	<button on:tap='set({ fromDom: this.textContent, fromState: item })'>{item}</button>
+{/each}
 
-<p>fromDom: {{fromDom}}</p>
-<p>fromState: {{fromState}}</p>
+<p>fromDom: {fromDom}</p>
+<p>fromState: {fromState}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/event-handler-custom-node-context/main.html b/test/runtime/samples/event-handler-custom-node-context/main.html
index 1634d51719..971cda8a8e 100644
--- a/test/runtime/samples/event-handler-custom-node-context/main.html
+++ b/test/runtime/samples/event-handler-custom-node-context/main.html
@@ -1,4 +1,4 @@
-<button on:tap='set({ z: z + 1 })'>{{z}}</button>
+<button on:tap='set({ z: z + 1 })'>{z}</button>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/event-handler-custom/main.html b/test/runtime/samples/event-handler-custom/main.html
index 949fafd727..53232e9b74 100644
--- a/test/runtime/samples/event-handler-custom/main.html
+++ b/test/runtime/samples/event-handler-custom/main.html
@@ -1,4 +1,4 @@
-<button on:tap='set({ x: event.x, y: event.y })'>{{x}}, {{y}}</button>
+<button on:tap='set({ x: event.x, y: event.y })'>{x}, {y}</button>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/event-handler-each-deconflicted/main.html b/test/runtime/samples/event-handler-each-deconflicted/main.html
index 4dcc770e83..e704a7eac0 100644
--- a/test/runtime/samples/event-handler-each-deconflicted/main.html
+++ b/test/runtime/samples/event-handler-each-deconflicted/main.html
@@ -1,9 +1,9 @@
-{{#each foo as f}}
+{#each foo as f}
 	<button on:click='set({ clicked: "foo" })'>foo</button>
-{{/each}}
+{/each}
 
-{{#each bar as b}}
+{#each bar as b}
 	<button on:click='set({ clicked: "bar" })'>bar</button>
-{{/each}}
+{/each}
 
-<p>clicked: {{clicked}}</p>
\ No newline at end of file
+<p>clicked: {clicked}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-each/main.html b/test/runtime/samples/event-handler-each/main.html
index 09a6e7b251..bd43d3bec6 100644
--- a/test/runtime/samples/event-handler-each/main.html
+++ b/test/runtime/samples/event-handler-each/main.html
@@ -1,5 +1,5 @@
-{{#each items as item}}
-	<button on:click='set({ selected: item })'>{{item}}</button>
-{{/each}}
+{#each items as item}
+	<button on:click='set({ selected: item })'>{item}</button>
+{/each}
 
-<p>selected: {{selected}}</p>
\ No newline at end of file
+<p>selected: {selected}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-hoisted/main.html b/test/runtime/samples/event-handler-hoisted/main.html
index 527218d170..5e9f8cd71d 100644
--- a/test/runtime/samples/event-handler-hoisted/main.html
+++ b/test/runtime/samples/event-handler-hoisted/main.html
@@ -1,6 +1,6 @@
-{{#each foo as bar}}
+{#each foo as bar}
 	<button on:click='baz(a)'>click me</button>
-{{/each}}
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/event-handler-removal/main.html b/test/runtime/samples/event-handler-removal/main.html
index 1a2da817b2..862af691a9 100644
--- a/test/runtime/samples/event-handler-removal/main.html
+++ b/test/runtime/samples/event-handler-removal/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
+{#if visible}
 	<input ref:input on:blur='set({ blurred: true })'>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/event-handler-sanitize/main.html b/test/runtime/samples/event-handler-sanitize/main.html
index eb8e10f825..05c80365f2 100644
--- a/test/runtime/samples/event-handler-sanitize/main.html
+++ b/test/runtime/samples/event-handler-sanitize/main.html
@@ -1,5 +1,5 @@
 <div on:some-event='set({ visible: !visible })'>toggle</div>
 
-{{#if visible}}
+{#if visible}
 	<p>hello!</p>
-{{/if}}
+{/if}
diff --git a/test/runtime/samples/event-handler/main.html b/test/runtime/samples/event-handler/main.html
index ba9bbc27fe..731fe32e75 100644
--- a/test/runtime/samples/event-handler/main.html
+++ b/test/runtime/samples/event-handler/main.html
@@ -1,5 +1,5 @@
 <button on:click='set({ visible: !visible })'>toggle</button>
 
-{{#if visible}}
+{#if visible}
 	<p>hello!</p>
-{{/if}}
+{/if}
diff --git a/test/runtime/samples/flush-before-bindings/Nested.html b/test/runtime/samples/flush-before-bindings/Nested.html
index d4071beee9..a722863cdd 100644
--- a/test/runtime/samples/flush-before-bindings/Nested.html
+++ b/test/runtime/samples/flush-before-bindings/Nested.html
@@ -1,8 +1,8 @@
-{{#each things as thing}}
+{#each things as thing}
 	<Visibility bind:isVisible="visibilityMap[thing]">
-		<p>{{thing}} ({{visibilityMap[thing]}})</p>
+		<p>{thing} ({visibilityMap[thing]})</p>
 	</Visibility>
-{{/each}}
+{/each}
 
 <script>
 	import Visibility from './Visibility.html';
@@ -17,7 +17,7 @@
 		},
 
 		computed: {
-			visibleThings: (things, visibilityMap) => {
+			visibleThings: ({ things, visibilityMap }) => {
 				counter.count += 1;
 				return things.filter(text => visibilityMap[text]);
 			}
diff --git a/test/runtime/samples/flush-before-bindings/Visibility.html b/test/runtime/samples/flush-before-bindings/Visibility.html
index 7b4c4f0d25..9ecda223f2 100644
--- a/test/runtime/samples/flush-before-bindings/Visibility.html
+++ b/test/runtime/samples/flush-before-bindings/Visibility.html
@@ -1,5 +1,5 @@
 <div>
-	{{yield}}
+	<slot></slot>
 </div>
 
 <script>
diff --git a/test/runtime/samples/function-in-expression/main.html b/test/runtime/samples/function-in-expression/main.html
index 2c98a5124d..1f038d771b 100644
--- a/test/runtime/samples/function-in-expression/main.html
+++ b/test/runtime/samples/function-in-expression/main.html
@@ -1 +1 @@
-{{ numbers.filter( x => x % 2 ).join( ', ' ) }}
\ No newline at end of file
+{ numbers.filter( x => x % 2 ).join( ', ' ) }
\ No newline at end of file
diff --git a/test/runtime/samples/get-state/main.html b/test/runtime/samples/get-state/main.html
index c8492f4db1..e67adaf72e 100644
--- a/test/runtime/samples/get-state/main.html
+++ b/test/runtime/samples/get-state/main.html
@@ -6,7 +6,7 @@
 		}),
 
 		computed: {
-			c: ( a, b ) => a + b,
+			c: ({ a, b }) => a + b,
 		}
 	};
 </script>
diff --git a/test/runtime/samples/globals-accessible-directly/main.html b/test/runtime/samples/globals-accessible-directly/main.html
index 349b4b1d32..77225fa117 100644
--- a/test/runtime/samples/globals-accessible-directly/main.html
+++ b/test/runtime/samples/globals-accessible-directly/main.html
@@ -1 +1 @@
-{{NaN}}
+{NaN}
diff --git a/test/runtime/samples/globals-not-dereferenced/main.html b/test/runtime/samples/globals-not-dereferenced/main.html
index 771042ed07..ec39251992 100644
--- a/test/runtime/samples/globals-not-dereferenced/main.html
+++ b/test/runtime/samples/globals-not-dereferenced/main.html
@@ -1 +1 @@
-{{Math.min(x, 5)}}
+{Math.min(x, 5)}
diff --git a/test/runtime/samples/globals-not-overwritten-by-bindings/main.html b/test/runtime/samples/globals-not-overwritten-by-bindings/main.html
index ca6c6ccb35..a8b873211c 100644
--- a/test/runtime/samples/globals-not-overwritten-by-bindings/main.html
+++ b/test/runtime/samples/globals-not-overwritten-by-bindings/main.html
@@ -1,6 +1,6 @@
-{{#each Object.keys(todos) as key}}
-	<div class='todo {{todos[key].done ? "done": ""}}'>
+{#each Object.keys(todos) as key}
+	<div class='todo {todos[key].done ? "done": ""}'>
 		<input type='checkbox' bind:checked='todos[key].done'>
 		<input type='text' bind:value='todos[key].description'>
 	</div>
-{{/each}}
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/globals-shadowed-by-data/main.html b/test/runtime/samples/globals-shadowed-by-data/main.html
index 73fd9437af..7e3b408331 100644
--- a/test/runtime/samples/globals-shadowed-by-data/main.html
+++ b/test/runtime/samples/globals-shadowed-by-data/main.html
@@ -1,4 +1,4 @@
-{{Math.min(x, 5)}}
+{Math.min(x, 5)}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/globals-shadowed-by-helpers/main.html b/test/runtime/samples/globals-shadowed-by-helpers/main.html
index 6746617b6d..98b8f19187 100644
--- a/test/runtime/samples/globals-shadowed-by-helpers/main.html
+++ b/test/runtime/samples/globals-shadowed-by-helpers/main.html
@@ -1,4 +1,4 @@
-{{Math.min(x, 5)}}
+{Math.min(x, 5)}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/head-title-dynamic/main-v2.html b/test/runtime/samples/head-title-dynamic/main-v2.html
deleted file mode 100644
index 255f344c00..0000000000
--- a/test/runtime/samples/head-title-dynamic/main-v2.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<svelte:head>
-	<title>a {adjective} title</title>
-	<meta name='twitter:creator' content='@sveltejs'>
-</svelte:head>
\ No newline at end of file
diff --git a/test/runtime/samples/head-title-dynamic/main.html b/test/runtime/samples/head-title-dynamic/main.html
index ae2b8c1caa..255f344c00 100644
--- a/test/runtime/samples/head-title-dynamic/main.html
+++ b/test/runtime/samples/head-title-dynamic/main.html
@@ -1,4 +1,4 @@
-<:Head>
-	<title>a {{adjective}} title</title>
+<svelte:head>
+	<title>a {adjective} title</title>
 	<meta name='twitter:creator' content='@sveltejs'>
-</:Head>
\ No newline at end of file
+</svelte:head>
\ No newline at end of file
diff --git a/test/runtime/samples/head-title-static/main-v2.html b/test/runtime/samples/head-title-static/main-v2.html
deleted file mode 100644
index 7f9da20911..0000000000
--- a/test/runtime/samples/head-title-static/main-v2.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<svelte:head>
-	<title>changed</title>
-	<meta name='twitter:creator' content='@sveltejs'>
-</svelte:head>
\ No newline at end of file
diff --git a/test/runtime/samples/head-title-static/main.html b/test/runtime/samples/head-title-static/main.html
index 9ab533140f..7f9da20911 100644
--- a/test/runtime/samples/head-title-static/main.html
+++ b/test/runtime/samples/head-title-static/main.html
@@ -1,4 +1,4 @@
-<:Head>
+<svelte:head>
 	<title>changed</title>
 	<meta name='twitter:creator' content='@sveltejs'>
-</:Head>
\ No newline at end of file
+</svelte:head>
\ No newline at end of file
diff --git a/test/runtime/samples/hello-world/main.html b/test/runtime/samples/hello-world/main.html
index f674269464..4820d55d09 100644
--- a/test/runtime/samples/hello-world/main.html
+++ b/test/runtime/samples/hello-world/main.html
@@ -1 +1 @@
-<h1>Hello {{name}}!</h1>
+<h1>Hello {name}!</h1>
diff --git a/test/runtime/samples/helpers-not-call-expression/main.html b/test/runtime/samples/helpers-not-call-expression/main.html
index e59a83eab8..c63838b138 100644
--- a/test/runtime/samples/helpers-not-call-expression/main.html
+++ b/test/runtime/samples/helpers-not-call-expression/main.html
@@ -1,4 +1,4 @@
-<p>{{numbers.map(square)}}</p>
+<p>{numbers.map(square)}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/helpers/main.html b/test/runtime/samples/helpers/main.html
index aebf031691..497a1d119e 100644
--- a/test/runtime/samples/helpers/main.html
+++ b/test/runtime/samples/helpers/main.html
@@ -1,4 +1,4 @@
-<p>{{reverse('backwards')}}</p>
+<p>{reverse('backwards')}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/if-block-else-in-each/main.html b/test/runtime/samples/if-block-else-in-each/main.html
index 81cd07273f..4df229b2e8 100644
--- a/test/runtime/samples/if-block-else-in-each/main.html
+++ b/test/runtime/samples/if-block-else-in-each/main.html
@@ -1,7 +1,7 @@
-{{#each array as item}}
-	{{#if item}}
+{#each array as item}
+	{#if item}
 		<div>foo</div>
-	{{else}}
+	{:else}
 		<div>bar</div>
-	{{/if}}
-{{/each}}
+	{/if}
+{/each}
diff --git a/test/runtime/samples/if-block-else/main.html b/test/runtime/samples/if-block-else/main.html
index 5a211aa840..997f503e98 100644
--- a/test/runtime/samples/if-block-else/main.html
+++ b/test/runtime/samples/if-block-else/main.html
@@ -1,11 +1,11 @@
-{{#if foo}}
+{#if foo}
 	<p>foo</p>
-{{else}}
+{:else}
 	<p>not foo</p>
-{{/if}}
+{/if}
 
-{{#if bar}}
+{#if bar}
 	<p>bar</p>
-{{else}}
+{:else}
 	<p>not bar</p>
-{{/if}}
+{/if}
diff --git a/test/runtime/samples/if-block-elseif-text/main.html b/test/runtime/samples/if-block-elseif-text/main.html
index 42fc0ca46f..43ac545677 100644
--- a/test/runtime/samples/if-block-elseif-text/main.html
+++ b/test/runtime/samples/if-block-elseif-text/main.html
@@ -1 +1 @@
-before-{{#if x > 10}}if{{elseif x < 5}}elseif{{else}}else{{/if}}-after
+before-{#if x > 10}if{:elseif x < 5}elseif{:else}else{/if}-after
diff --git a/test/runtime/samples/if-block-elseif/main.html b/test/runtime/samples/if-block-elseif/main.html
index 254d7a2202..ffa5879943 100644
--- a/test/runtime/samples/if-block-elseif/main.html
+++ b/test/runtime/samples/if-block-elseif/main.html
@@ -1,7 +1,7 @@
-{{#if x > 10}}
+{#if x > 10}
 	<p>x is greater than 10</p>
-{{elseif x < 5}}
+{:elseif x < 5}
 	<p>x is less than 5</p>
-{{else}}
+{:else}
 	<p>x is between 5 and 10</p>
-{{/if}}
+{/if}
diff --git a/test/runtime/samples/if-block-expression/main.html b/test/runtime/samples/if-block-expression/main.html
index 31b8bc6392..10d2c7b74f 100644
--- a/test/runtime/samples/if-block-expression/main.html
+++ b/test/runtime/samples/if-block-expression/main.html
@@ -1,3 +1,3 @@
-{{#if 2 > 1}}
+{#if 2 > 1}
 	<p>two is greater than one</p>
-{{/if}}
+{/if}
diff --git a/test/runtime/samples/if-block-or/main.html b/test/runtime/samples/if-block-or/main.html
index 68d6158688..8f3713bffb 100644
--- a/test/runtime/samples/if-block-or/main.html
+++ b/test/runtime/samples/if-block-or/main.html
@@ -1,3 +1,3 @@
-{{#if a || b}}
+{#if a || b}
 	<p>i am visible</p>
-{{/if}}
+{/if}
diff --git a/test/runtime/samples/if-block-widget/main.html b/test/runtime/samples/if-block-widget/main.html
index 5e2a3859b4..cd73d020a6 100644
--- a/test/runtime/samples/if-block-widget/main.html
+++ b/test/runtime/samples/if-block-widget/main.html
@@ -1,7 +1,7 @@
 before
-{{#if visible}}
+{#if visible}
 	<Widget />
-{{/if}}
+{/if}
 after
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/if-block/main.html b/test/runtime/samples/if-block/main.html
index 5150cf0330..a54acecb15 100644
--- a/test/runtime/samples/if-block/main.html
+++ b/test/runtime/samples/if-block/main.html
@@ -1,3 +1,3 @@
-{{#if visible}}
+{#if visible}
 	<p>i am visible</p>
-{{/if}}
+{/if}
diff --git a/test/runtime/samples/if-in-keyed-each/main.html b/test/runtime/samples/if-in-keyed-each/main.html
index 1787fa3218..65ebcdd330 100644
--- a/test/runtime/samples/if-in-keyed-each/main.html
+++ b/test/runtime/samples/if-in-keyed-each/main.html
@@ -1,7 +1,7 @@
 <ul>
-	{{#each items as item @id}}
-		{{#if item.id}}
-			<li>{{item.name}}</li>
-		{{/if}}
-	{{/each}}
+	{#each items as item (item.id)}
+		{#if item.id}
+			<li>{item.name}</li>
+		{/if}
+	{/each}
 </ul>
\ No newline at end of file
diff --git a/test/runtime/samples/ignore-unchanged-attribute-compound/main.html b/test/runtime/samples/ignore-unchanged-attribute-compound/main.html
index 1e742befd9..a99f94147e 100644
--- a/test/runtime/samples/ignore-unchanged-attribute-compound/main.html
+++ b/test/runtime/samples/ignore-unchanged-attribute-compound/main.html
@@ -1,5 +1,5 @@
-<p>{{x}}</p>
-<p class='-{{myHelper(y)}}-'></p>
+<p>{x}</p>
+<p class='-{myHelper(y)}-'></p>
 
 <script>
 	import counter from './counter.js';
diff --git a/test/runtime/samples/ignore-unchanged-attribute/main.html b/test/runtime/samples/ignore-unchanged-attribute/main.html
index afaa83c85f..463e21735d 100644
--- a/test/runtime/samples/ignore-unchanged-attribute/main.html
+++ b/test/runtime/samples/ignore-unchanged-attribute/main.html
@@ -1,5 +1,5 @@
-<p>{{x}}</p>
-<p class='{{myHelper(y)}}'></p>
+<p>{x}</p>
+<p class='{myHelper(y)}'></p>
 
 <script>
 	import counter from './counter.js';
diff --git a/test/runtime/samples/ignore-unchanged-raw/main.html b/test/runtime/samples/ignore-unchanged-raw/main.html
index 375985c0d2..c28e7b537e 100644
--- a/test/runtime/samples/ignore-unchanged-raw/main.html
+++ b/test/runtime/samples/ignore-unchanged-raw/main.html
@@ -1,5 +1,5 @@
-<p>{{x}}</p>
-<p>{{{myHelper(y)}}}</p>
+<p>{x}</p>
+<p>{@html myHelper(y)}</p>
 
 <script>
 	import counter from './counter.js';
diff --git a/test/runtime/samples/ignore-unchanged-tag/main.html b/test/runtime/samples/ignore-unchanged-tag/main.html
index f50864df94..e2a7899122 100644
--- a/test/runtime/samples/ignore-unchanged-tag/main.html
+++ b/test/runtime/samples/ignore-unchanged-tag/main.html
@@ -1,5 +1,5 @@
-<p>{{x}}</p>
-<p>{{myHelper(y)}}</p>
+<p>{x}</p>
+<p>{myHelper(y)}</p>
 
 <script>
 	import counter from './counter.js';
diff --git a/test/runtime/samples/immutable-mutable/Nested.html b/test/runtime/samples/immutable-mutable/Nested.html
index f23d8f4257..1d623779eb 100644
--- a/test/runtime/samples/immutable-mutable/Nested.html
+++ b/test/runtime/samples/immutable-mutable/Nested.html
@@ -1,4 +1,4 @@
-<h3>Called {{count}} times.</h3>
+<h3>Called {count} times.</h3>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/immutable-nested/Nested.html b/test/runtime/samples/immutable-nested/Nested.html
index 05eb9f3fdf..1f3d808d63 100644
--- a/test/runtime/samples/immutable-nested/Nested.html
+++ b/test/runtime/samples/immutable-nested/Nested.html
@@ -1,4 +1,4 @@
-<h3>Called {{count}} times.</h3>
+<h3>Called {count} times.</h3>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/immutable-root/main.html b/test/runtime/samples/immutable-root/main.html
index 087f561caf..b54f41743c 100644
--- a/test/runtime/samples/immutable-root/main.html
+++ b/test/runtime/samples/immutable-root/main.html
@@ -1,5 +1,5 @@
 <div>
-	<h3>Called {{count}} times.</h3>
+	<h3>Called {count} times.</h3>
 </div>
 
 <script>
diff --git a/test/runtime/samples/initial-state-assign/main.html b/test/runtime/samples/initial-state-assign/main.html
index 5c9f1826a0..be3a613784 100644
--- a/test/runtime/samples/initial-state-assign/main.html
+++ b/test/runtime/samples/initial-state-assign/main.html
@@ -1,5 +1,5 @@
-{{JSON.stringify(foo)}}
-{{JSON.stringify(bar)}}
+{JSON.stringify(foo)}
+{JSON.stringify(bar)}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/inline-expressions/main.html b/test/runtime/samples/inline-expressions/main.html
index 93c55f37e3..e5da1ff551 100644
--- a/test/runtime/samples/inline-expressions/main.html
+++ b/test/runtime/samples/inline-expressions/main.html
@@ -1 +1 @@
-<p>{{a}} + {{b}} = {{a + b}}</p>
+<p>{a} + {b} = {a + b}</p>
diff --git a/test/runtime/samples/names-deconflicted-nested/main.html b/test/runtime/samples/names-deconflicted-nested/main.html
index 7de2cf204d..4d0b8ae1b6 100644
--- a/test/runtime/samples/names-deconflicted-nested/main.html
+++ b/test/runtime/samples/names-deconflicted-nested/main.html
@@ -1,7 +1,7 @@
-{{#each array as row, i}}
+{#each array as row, i}
 	<div>
-		{{#each row as cell, j}}
-			<span>[ {{i}}, {{j}} ]</span>
-		{{/each}}
+		{#each row as cell, j}
+			<span>[ {i}, {j} ]</span>
+		{/each}
 	</div>
-{{/each}}
+{/each}
diff --git a/test/runtime/samples/names-deconflicted/Widget.html b/test/runtime/samples/names-deconflicted/Widget.html
index 9a6074567b..a004758196 100644
--- a/test/runtime/samples/names-deconflicted/Widget.html
+++ b/test/runtime/samples/names-deconflicted/Widget.html
@@ -1 +1 @@
-<p>{{index + 1}}: {{widget.name}}</p>
+<p>{index + 1}: {widget.name}</p>
diff --git a/test/runtime/samples/names-deconflicted/main.html b/test/runtime/samples/names-deconflicted/main.html
index ca6eac71db..282c438267 100644
--- a/test/runtime/samples/names-deconflicted/main.html
+++ b/test/runtime/samples/names-deconflicted/main.html
@@ -1,6 +1,6 @@
-{{#each widgets as widget, i}}
-	<Widget widget='{{widget}}' index='{{i}}'/>
-{{/each}}
+{#each widgets as widget, i}
+	<Widget widget='{widget}' index='{i}'/>
+{/each}
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/non-root-style-interpolation/_config.js b/test/runtime/samples/non-root-style-interpolation/_config.js
deleted file mode 100644
index 01cefdd67e..0000000000
--- a/test/runtime/samples/non-root-style-interpolation/_config.js
+++ /dev/null
@@ -1,52 +0,0 @@
-export default {
-	data: {
-		color: 'red',
-		foo: '/* < & > */',
-	},
-
-	html: `
-		<div>
-			<style>
-				/* something with < and > */
-				div {
-					color: blue;
-				}
-			</style>
-			foo
-		</div>
-
-		<div>
-			<div>
-				<style>
-					div > div {
-						color: blue;
-					}
-				</style>
-				foo
-			</div>
-		</div>
-
-		<div>
-			<style>
-				/* something with < and > */
-				/* < & > */
-				div {
-					color: red;
-				}
-			</style>
-			foo
-		</div>
-
-		<div>
-			<div>
-				<style>
-					/* < & > */
-					div > div {
-						color: red;
-					}
-				</style>
-				foo
-			</div>
-		</div>
-	`,
-};
diff --git a/test/runtime/samples/non-root-style-interpolation/main.html b/test/runtime/samples/non-root-style-interpolation/main.html
deleted file mode 100644
index 1908f64808..0000000000
--- a/test/runtime/samples/non-root-style-interpolation/main.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<div>
-	<style>
-		/* something with < and > */
-		div {
-			color: blue;
-		}
-	</style>
-	foo
-</div>
-
-<div>
-	<div>
-		<style>
-			div > div {
-				color: blue;
-			}
-		</style>
-		foo
-	</div>
-</div>
-
-<div>
-	<style>
-		/* something with < and > */
-		{{foo}}
-		div {
-			color: {{color}};
-		}
-	</style>
-	foo
-</div>
-
-<div>
-	<div>
-		<style>
-			{{foo}}
-			div > div {
-				color: {{color}};
-			}
-		</style>
-		foo
-	</div>
-</div>
diff --git a/test/runtime/samples/observe-binding-ignores-unchanged/main.html b/test/runtime/samples/observe-binding-ignores-unchanged/main.html
index 8cdc42f96e..2492f1830e 100644
--- a/test/runtime/samples/observe-binding-ignores-unchanged/main.html
+++ b/test/runtime/samples/observe-binding-ignores-unchanged/main.html
@@ -1,6 +1,6 @@
 <Nested ref:nested bind:field1="myObject.field1" bind:field2="myObject.field2" />
-<p>field1: {{myObject.field1}}</p>
-<p>field2: {{myObject.field2}}</p>
+<p>field1: {myObject.field1}</p>
+<p>field2: {myObject.field2}</p>
 
 <script>
 	import Nested from './Nested.html';
diff --git a/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html b/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html
index 53b5586f1d..2063d8c1b0 100644
--- a/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html
+++ b/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html
@@ -1,4 +1,4 @@
-<Foo ref:foo x='{{x}}'/>
+<Foo ref:foo x='{x}'/>
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/observe-deferred/main.html b/test/runtime/samples/observe-deferred/main.html
index 4ef322ab42..9765e91159 100644
--- a/test/runtime/samples/observe-deferred/main.html
+++ b/test/runtime/samples/observe-deferred/main.html
@@ -1,4 +1,4 @@
-<p ref:a>{{value}}</p>
+<p ref:a>{value}</p>
 <p ref:b></p>
 
 <script>
diff --git a/test/runtime/samples/oncreate-sibling-order/Nested.html b/test/runtime/samples/oncreate-sibling-order/Nested.html
index 84841cb6a4..6bf82772a0 100644
--- a/test/runtime/samples/oncreate-sibling-order/Nested.html
+++ b/test/runtime/samples/oncreate-sibling-order/Nested.html
@@ -1,4 +1,4 @@
-<p>{{name}}</p>
+<p>{name}</p>
 
 <script>
 	import result from './result.js';
diff --git a/test/runtime/samples/ondestroy-before-cleanup/main.html b/test/runtime/samples/ondestroy-before-cleanup/main.html
index c4b7ac879f..cce0356f6a 100644
--- a/test/runtime/samples/ondestroy-before-cleanup/main.html
+++ b/test/runtime/samples/ondestroy-before-cleanup/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
+{#if visible}
 	<Top ref:top></Top>
-{{/if}}
+{/if}
 
 <script>
 	import Top from './Top.html';
diff --git a/test/runtime/samples/onrender-chain/Item.html b/test/runtime/samples/onrender-chain/Item.html
index 4eb126062b..ca0f489b57 100644
--- a/test/runtime/samples/onrender-chain/Item.html
+++ b/test/runtime/samples/onrender-chain/Item.html
@@ -1,4 +1,4 @@
-<span>{{foo}}</span>
+<span>{foo}</span>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/onrender-chain/List.html b/test/runtime/samples/onrender-chain/List.html
index 5bf8f12cd8..513c62b2e6 100644
--- a/test/runtime/samples/onrender-chain/List.html
+++ b/test/runtime/samples/onrender-chain/List.html
@@ -1,6 +1,6 @@
-{{#each items as item}}
-	<Item item={{item}} />
-{{/each}}
+{#each items as item}
+	<Item item={item} />
+{/each}
 
 <script>
 	import Item from './Item.html';
diff --git a/test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html b/test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html
index 1ab8608eff..5774edea19 100644
--- a/test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html
+++ b/test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html
@@ -1,4 +1,4 @@
-<Widget/>{{#if foo}}<Widget/>{{/if}}
+<Widget/>{#if foo}<Widget/>{/if}
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/onrender-fires-when-ready-nested/Widget.html b/test/runtime/samples/onrender-fires-when-ready-nested/Widget.html
index 1bcf103d01..4bbcb98f33 100644
--- a/test/runtime/samples/onrender-fires-when-ready-nested/Widget.html
+++ b/test/runtime/samples/onrender-fires-when-ready-nested/Widget.html
@@ -1,4 +1,4 @@
-<p ref:x>{{inDocument}}</p>
+<p ref:x>{inDocument}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/onrender-fires-when-ready/Widget.html b/test/runtime/samples/onrender-fires-when-ready/Widget.html
index 1bcf103d01..4bbcb98f33 100644
--- a/test/runtime/samples/onrender-fires-when-ready/Widget.html
+++ b/test/runtime/samples/onrender-fires-when-ready/Widget.html
@@ -1,4 +1,4 @@
-<p ref:x>{{inDocument}}</p>
+<p ref:x>{inDocument}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/onrender-fires-when-ready/main.html b/test/runtime/samples/onrender-fires-when-ready/main.html
index d2d048c1b3..49bfc412d0 100644
--- a/test/runtime/samples/onrender-fires-when-ready/main.html
+++ b/test/runtime/samples/onrender-fires-when-ready/main.html
@@ -1,9 +1,9 @@
 <div>
 	<Widget/>
 
-	{{#if foo}}
+	{#if foo}
 		<Widget/>
-	{{/if}}
+	{/if}
 </div>
 
 <script>
diff --git a/test/runtime/samples/onstate-event/main.html b/test/runtime/samples/onstate-event/main.html
index 3699be60db..fbcc02f2f8 100644
--- a/test/runtime/samples/onstate-event/main.html
+++ b/test/runtime/samples/onstate-event/main.html
@@ -1,2 +1,2 @@
-<p>{{foo}}</p>
-<p>{{bar}}</p>
\ No newline at end of file
+<p>{foo}</p>
+<p>{bar}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/onstate/main.html b/test/runtime/samples/onstate/main.html
index 5e2cbaee8c..f35c64cd74 100644
--- a/test/runtime/samples/onstate/main.html
+++ b/test/runtime/samples/onstate/main.html
@@ -1,5 +1,5 @@
-<p>{{foo}}</p>
-<p>{{bar}}</p>
+<p>{foo}</p>
+<p>{bar}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/onupdate/main.html b/test/runtime/samples/onupdate/main.html
index ea65e9f3d2..49afda13e5 100644
--- a/test/runtime/samples/onupdate/main.html
+++ b/test/runtime/samples/onupdate/main.html
@@ -1,4 +1,4 @@
-<p ref:a>{{value}}</p>
+<p ref:a>{value}</p>
 <p ref:b></p>
 
 <script>
diff --git a/test/runtime/samples/option-without-select/main.html b/test/runtime/samples/option-without-select/main.html
index 36c101d13d..b0156e95c5 100644
--- a/test/runtime/samples/option-without-select/main.html
+++ b/test/runtime/samples/option-without-select/main.html
@@ -1 +1 @@
-<option value='{{foo}}'>{{foo}}</option>
\ No newline at end of file
+<option value='{foo}'>{foo}</option>
\ No newline at end of file
diff --git a/test/runtime/samples/options/main.html b/test/runtime/samples/options/main.html
index 2cd6339235..1053bc4c0a 100644
--- a/test/runtime/samples/options/main.html
+++ b/test/runtime/samples/options/main.html
@@ -1,4 +1,4 @@
-<p>{{text}}</p>
+<p>{text}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/paren-wrapped-expressions/main.html b/test/runtime/samples/paren-wrapped-expressions/main.html
index ec4b4152c4..f76ea96950 100644
--- a/test/runtime/samples/paren-wrapped-expressions/main.html
+++ b/test/runtime/samples/paren-wrapped-expressions/main.html
@@ -1,8 +1,8 @@
-<span>{{ (a) }}</span>
-<span class='{{ (a) }}'></span>
-{{#if (b) }}
+<span>{ (a) }</span>
+<span class='{ (a) }'></span>
+{#if (b) }
 	<span>true</span>
-{{/if}}
-{{#each (c) as x}}
-	<span>{{x}}</span>
-{{/each}}
+{/if}
+{#each (c) as x}
+	<span>{x}</span>
+{/each}
diff --git a/test/runtime/samples/raw-anchor-first-child/main.html b/test/runtime/samples/raw-anchor-first-child/main.html
index f9a62f27ea..1c882f4e7d 100644
--- a/test/runtime/samples/raw-anchor-first-child/main.html
+++ b/test/runtime/samples/raw-anchor-first-child/main.html
@@ -1 +1 @@
-<div>{{{raw}}}{{#if maybe}}after{{/if}}</div>
+<div>{@html raw}{#if maybe}after{/if}</div>
diff --git a/test/runtime/samples/raw-anchor-first-last-child/main.html b/test/runtime/samples/raw-anchor-first-last-child/main.html
index 4f10ae03c0..610d1f3141 100644
--- a/test/runtime/samples/raw-anchor-first-last-child/main.html
+++ b/test/runtime/samples/raw-anchor-first-last-child/main.html
@@ -1 +1 @@
-<div>{{{raw}}}</div>
+<div>{@html raw}</div>
diff --git a/test/runtime/samples/raw-anchor-last-child/main.html b/test/runtime/samples/raw-anchor-last-child/main.html
index 67b6adf483..4267bfa933 100644
--- a/test/runtime/samples/raw-anchor-last-child/main.html
+++ b/test/runtime/samples/raw-anchor-last-child/main.html
@@ -1 +1 @@
-<div>{{#if maybe}}after{{/if}}{{{raw}}}</div>
+<div>{#if maybe}after{/if}{@html raw}</div>
diff --git a/test/runtime/samples/raw-anchor-next-previous-sibling/main.html b/test/runtime/samples/raw-anchor-next-previous-sibling/main.html
index d0a2a83668..701d85c2b2 100644
--- a/test/runtime/samples/raw-anchor-next-previous-sibling/main.html
+++ b/test/runtime/samples/raw-anchor-next-previous-sibling/main.html
@@ -1 +1 @@
-before<br>{{{raw}}}<br>after
+before<br>{@html raw}<br>after
diff --git a/test/runtime/samples/raw-anchor-next-sibling/main.html b/test/runtime/samples/raw-anchor-next-sibling/main.html
index 00c18218a0..24472a362e 100644
--- a/test/runtime/samples/raw-anchor-next-sibling/main.html
+++ b/test/runtime/samples/raw-anchor-next-sibling/main.html
@@ -1 +1 @@
-before<br>{{{raw}}}{{#if maybe}}after{{/if}}
+before<br>{@html raw}{#if maybe}after{/if}
diff --git a/test/runtime/samples/raw-anchor-previous-sibling/main.html b/test/runtime/samples/raw-anchor-previous-sibling/main.html
index 00c18218a0..24472a362e 100644
--- a/test/runtime/samples/raw-anchor-previous-sibling/main.html
+++ b/test/runtime/samples/raw-anchor-previous-sibling/main.html
@@ -1 +1 @@
-before<br>{{{raw}}}{{#if maybe}}after{{/if}}
+before<br>{@html raw}{#if maybe}after{/if}
diff --git a/test/runtime/samples/raw-mustaches-preserved/main.html b/test/runtime/samples/raw-mustaches-preserved/main.html
index 4f10ae03c0..610d1f3141 100644
--- a/test/runtime/samples/raw-mustaches-preserved/main.html
+++ b/test/runtime/samples/raw-mustaches-preserved/main.html
@@ -1 +1 @@
-<div>{{{raw}}}</div>
+<div>{@html raw}</div>
diff --git a/test/runtime/samples/raw-mustaches/main.html b/test/runtime/samples/raw-mustaches/main.html
index 1a733843df..28c657e9a6 100644
--- a/test/runtime/samples/raw-mustaches/main.html
+++ b/test/runtime/samples/raw-mustaches/main.html
@@ -1 +1 @@
-before{{{raw}}}after
+before{@html raw}after
diff --git a/test/runtime/samples/refs-unset/main.html b/test/runtime/samples/refs-unset/main.html
index 0fe6856d8f..6a18aa6bee 100644
--- a/test/runtime/samples/refs-unset/main.html
+++ b/test/runtime/samples/refs-unset/main.html
@@ -1,5 +1,5 @@
-{{#if x}}
+{#if x}
 	<canvas ref:foo data-x='true'></canvas>
-{{else}}
+{:else}
 	<canvas ref:foo data-x='false'></canvas>
-{{/if}}
+{/if}
diff --git a/test/runtime/samples/script-style-non-top-level/main-v2.html b/test/runtime/samples/script-style-non-top-level/main-v2.html
deleted file mode 100644
index 94cf72e4bd..0000000000
--- a/test/runtime/samples/script-style-non-top-level/main-v2.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-	<style>div { color: red; }</style>
-	<script>alert('<>');</script>
-</div>
\ No newline at end of file
diff --git a/test/runtime/samples/select-bind-array/main.html b/test/runtime/samples/select-bind-array/main.html
index 7971c4fe10..67c1dfdb91 100644
--- a/test/runtime/samples/select-bind-array/main.html
+++ b/test/runtime/samples/select-bind-array/main.html
@@ -1,5 +1,5 @@
 <select bind:value="foo">
-	{{#each items as item}}
-		<option value='{{item.id}}'>{{item.id}}</option>
-	{{/each}}
+	{#each items as item}
+		<option value='{item.id}'>{item.id}</option>
+	{/each}
 </select>
diff --git a/test/runtime/samples/select-bind-in-array/main.html b/test/runtime/samples/select-bind-in-array/main.html
index 1a80b1afa0..9a4d1e82cd 100644
--- a/test/runtime/samples/select-bind-in-array/main.html
+++ b/test/runtime/samples/select-bind-in-array/main.html
@@ -1,6 +1,6 @@
-{{#each items as item}}
+{#each items as item}
   <select bind:value="item.id">
     <option value='a'>a</option>
     <option value='b'>b</option>
   </select>
-{{/each}}
+{/each}
diff --git a/test/runtime/samples/select-change-handler/main.html b/test/runtime/samples/select-change-handler/main.html
index 48376dfa93..13d9bd75af 100644
--- a/test/runtime/samples/select-change-handler/main.html
+++ b/test/runtime/samples/select-change-handler/main.html
@@ -1,7 +1,7 @@
 <select bind:value="selected" on:change="updateLastChangedTo(selected)">
-	{{#each options as option}}
-		<option value="{{option.id}}">{{option.id}}</option>
-	{{/each}}
+	{#each options as option}
+		<option value="{option.id}">{option.id}</option>
+	{/each}
 </select>
 
 <script>
diff --git a/test/runtime/samples/select-one-way-bind-object/main.html b/test/runtime/samples/select-one-way-bind-object/main.html
index 6f74305c53..f5422990d3 100644
--- a/test/runtime/samples/select-one-way-bind-object/main.html
+++ b/test/runtime/samples/select-one-way-bind-object/main.html
@@ -1,4 +1,4 @@
-<select value="{{foo}}">
-	<option value='{{items[0]}}'>a</option>
-	<option value='{{items[1]}}'>b</option>
+<select value="{foo}">
+	<option value='{items[0]}'>a</option>
+	<option value='{items[1]}'>b</option>
 </select>
diff --git a/test/runtime/samples/select-one-way-bind/main.html b/test/runtime/samples/select-one-way-bind/main.html
index 9072a822b8..9764039c25 100644
--- a/test/runtime/samples/select-one-way-bind/main.html
+++ b/test/runtime/samples/select-one-way-bind/main.html
@@ -1,4 +1,4 @@
-<select value="{{foo}}">
+<select value="{foo}">
 	<option>a</option>
 	<option>b</option>
 </select>
diff --git a/test/runtime/samples/select-props/main.html b/test/runtime/samples/select-props/main.html
index 7decc88fb7..9886a8b7b1 100644
--- a/test/runtime/samples/select-props/main.html
+++ b/test/runtime/samples/select-props/main.html
@@ -1,9 +1,9 @@
-{{#each foo as bar}}
+{#each foo as bar}
 	<select on:change='handler(bar)'>
 		<option>a</option>
 		<option>b</option>
 	</select>
-{{/each}}
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/select/main.html b/test/runtime/samples/select/main.html
index 8626bb8e2a..294954edd0 100644
--- a/test/runtime/samples/select/main.html
+++ b/test/runtime/samples/select/main.html
@@ -1,5 +1,5 @@
 <select>
-	<option value="{{item.key}}">{{item.name}}</option>
+	<option value="{item.key}">{item.name}</option>
 	<option value="b">Two</option>
 	<option value="c">Three</option>
 </select>
diff --git a/test/runtime/samples/self-reference-tree/main-v2.html b/test/runtime/samples/self-reference-tree/main-v2.html
deleted file mode 100644
index 6663cf9533..0000000000
--- a/test/runtime/samples/self-reference-tree/main-v2.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<article class='file {file.type}'>
-	<span class='name'>{file.name}</span>
-
-	{#if file.type === 'folder'}
-		<ul>
-			{#each file.children as child}
-				<li><svelte:self file='{child}'/></li>
-			{/each}
-		</ul>
-	{/if}
-</article>
\ No newline at end of file
diff --git a/test/runtime/samples/self-reference-tree/main.html b/test/runtime/samples/self-reference-tree/main.html
index f9e5ed6a06..6663cf9533 100644
--- a/test/runtime/samples/self-reference-tree/main.html
+++ b/test/runtime/samples/self-reference-tree/main.html
@@ -1,11 +1,11 @@
-<article class='file {{file.type}}'>
-	<span class='name'>{{file.name}}</span>
+<article class='file {file.type}'>
+	<span class='name'>{file.name}</span>
 
-	{{#if file.type === 'folder'}}
+	{#if file.type === 'folder'}
 		<ul>
-			{{#each file.children as child}}
-				<li><:Self file='{{child}}'/></li>
-			{{/each}}
+			{#each file.children as child}
+				<li><svelte:self file='{child}'/></li>
+			{/each}
 		</ul>
-	{{/if}}
+	{/if}
 </article>
\ No newline at end of file
diff --git a/test/runtime/samples/self-reference/main-v2.html b/test/runtime/samples/self-reference/main-v2.html
deleted file mode 100644
index e5581203c3..0000000000
--- a/test/runtime/samples/self-reference/main-v2.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<span>{depth}</span>
-{#if depth > 0}
-	<svelte:self depth='{depth - 1}'/>
-{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/self-reference/main.html b/test/runtime/samples/self-reference/main.html
index d310b340ce..e5581203c3 100644
--- a/test/runtime/samples/self-reference/main.html
+++ b/test/runtime/samples/self-reference/main.html
@@ -1,4 +1,4 @@
-<span>{{depth}}</span>
-{{#if depth > 0}}
-	<:Self depth='{{depth - 1}}'/>
-{{/if}}
\ No newline at end of file
+<span>{depth}</span>
+{#if depth > 0}
+	<svelte:self depth='{depth - 1}'/>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/set-after-destroy/main.html b/test/runtime/samples/set-after-destroy/main.html
index e60a1a28e2..44da74a72d 100644
--- a/test/runtime/samples/set-after-destroy/main.html
+++ b/test/runtime/samples/set-after-destroy/main.html
@@ -1 +1 @@
-<div>{{x}}</div>
\ No newline at end of file
+<div>{x}</div>
\ No newline at end of file
diff --git a/test/runtime/samples/set-clones-input/main.html b/test/runtime/samples/set-clones-input/main.html
index 68af076723..b5291a0790 100644
--- a/test/runtime/samples/set-clones-input/main.html
+++ b/test/runtime/samples/set-clones-input/main.html
@@ -1,7 +1,7 @@
 <script>
 	export default {
 		computed: {
-			b: a => a + 1
+			b: ({ a }) => a + 1
 		}
 	};
 </script>
\ No newline at end of file
diff --git a/test/runtime/samples/set-in-oncreate/main.html b/test/runtime/samples/set-in-oncreate/main.html
index 8e71ec5905..77633574f1 100644
--- a/test/runtime/samples/set-in-oncreate/main.html
+++ b/test/runtime/samples/set-in-oncreate/main.html
@@ -1,4 +1,4 @@
-<p>{{foo}}</p>
+<p>{foo}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/set-in-onstate-dedupes-renders/Widget.html b/test/runtime/samples/set-in-onstate-dedupes-renders/Widget.html
index 3d64f43eff..1d9c77e304 100644
--- a/test/runtime/samples/set-in-onstate-dedupes-renders/Widget.html
+++ b/test/runtime/samples/set-in-onstate-dedupes-renders/Widget.html
@@ -1,4 +1,4 @@
-<div>{{foo.x}}</div>
+<div>{foo.x}</div>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/set-in-onstate-dedupes-renders/main.html b/test/runtime/samples/set-in-onstate-dedupes-renders/main.html
index 2f621f33d0..6813463ec1 100644
--- a/test/runtime/samples/set-in-onstate-dedupes-renders/main.html
+++ b/test/runtime/samples/set-in-onstate-dedupes-renders/main.html
@@ -1,4 +1,4 @@
-<Widget foo='{{foo}}' bar='{{bar}}'/>
+<Widget foo='{foo}' bar='{bar}'/>
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/set-in-onstate/main.html b/test/runtime/samples/set-in-onstate/main.html
index 7446198502..a5776566ed 100644
--- a/test/runtime/samples/set-in-onstate/main.html
+++ b/test/runtime/samples/set-in-onstate/main.html
@@ -1,5 +1,5 @@
-<p>{{foo}}</p>
-<p>{{bar}}</p>
+<p>{foo}</p>
+<p>{bar}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/set-mutated-data/main.html b/test/runtime/samples/set-mutated-data/main.html
index 24369f73a4..e076ac55f8 100644
--- a/test/runtime/samples/set-mutated-data/main.html
+++ b/test/runtime/samples/set-mutated-data/main.html
@@ -1 +1 @@
-{{foo}}
\ No newline at end of file
+{foo}
\ No newline at end of file
diff --git a/test/runtime/samples/set-prevents-loop/main.html b/test/runtime/samples/set-prevents-loop/main.html
index becfe053fe..685bfeaa14 100644
--- a/test/runtime/samples/set-prevents-loop/main.html
+++ b/test/runtime/samples/set-prevents-loop/main.html
@@ -1,8 +1,8 @@
-{{#if visible}}
+{#if visible}
 	<Foo bind:answer/>
-{{else}}
+{:else}
 	<Foo bind:answer/>
-{{/if}}
+{/if}
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/sigil-component-attribute/Widget.html b/test/runtime/samples/sigil-component-attribute/Widget.html
index f0136f9405..5964bdac68 100644
--- a/test/runtime/samples/sigil-component-attribute/Widget.html
+++ b/test/runtime/samples/sigil-component-attribute/Widget.html
@@ -1 +1 @@
-<div>{{value}}</div>
+<div>{value}</div>
diff --git a/test/runtime/samples/sigil-component-attribute/main.html b/test/runtime/samples/sigil-component-attribute/main.html
index c9302309d2..a5abcd92e5 100644
--- a/test/runtime/samples/sigil-component-attribute/main.html
+++ b/test/runtime/samples/sigil-component-attribute/main.html
@@ -1,4 +1,4 @@
-<Widget value='foo @ {{foo}} # foo'/>
+<Widget value='foo @ {foo} # foo'/>
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/spread-component-dynamic/Foo.html b/test/runtime/samples/spread-component-dynamic/Foo.html
index 5d65e4f614..e7884fdfee 100644
--- a/test/runtime/samples/spread-component-dynamic/Foo.html
+++ b/test/runtime/samples/spread-component-dynamic/Foo.html
@@ -1 +1 @@
-<p>a: {{a}}</p>
\ No newline at end of file
+<p>a: {a}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/spread-component-dynamic/main.html b/test/runtime/samples/spread-component-dynamic/main.html
index 687e54db79..7b89cf5a19 100644
--- a/test/runtime/samples/spread-component-dynamic/main.html
+++ b/test/runtime/samples/spread-component-dynamic/main.html
@@ -1,4 +1,4 @@
-<:Component {Foo} {{...props}} />
+<svelte:component this={Foo} {...props} />
 
 <script>
 	import Foo from './Foo.html';
diff --git a/test/runtime/samples/spread-component/Widget.html b/test/runtime/samples/spread-component/Widget.html
index 43184b9ad8..a60afb741c 100644
--- a/test/runtime/samples/spread-component/Widget.html
+++ b/test/runtime/samples/spread-component/Widget.html
@@ -1,4 +1,4 @@
-<p>foo: {{foo}}</p>
-<p>baz: {{baz}} ({{typeof baz}})</p>
-<p>qux: {{qux}}</p>
-<p>quux: {{quux}}</p>
+<p>foo: {foo}</p>
+<p>baz: {baz} ({typeof baz})</p>
+<p>qux: {qux}</p>
+<p>quux: {quux}</p>
diff --git a/test/runtime/samples/spread-component/main.html b/test/runtime/samples/spread-component/main.html
index e6b16a4429..ea7e0a812c 100644
--- a/test/runtime/samples/spread-component/main.html
+++ b/test/runtime/samples/spread-component/main.html
@@ -1,5 +1,5 @@
 <div>
-	<Widget {{...props}} qux="named"/>
+	<Widget {...props} qux="named"/>
 </div>
 
 <script>
diff --git a/test/runtime/samples/spread-element-boolean/main.html b/test/runtime/samples/spread-element-boolean/main.html
index 9469dab0d6..5cd4df8766 100644
--- a/test/runtime/samples/spread-element-boolean/main.html
+++ b/test/runtime/samples/spread-element-boolean/main.html
@@ -1 +1 @@
-<button {{...props}} >click me</button>
\ No newline at end of file
+<button {...props} >click me</button>
\ No newline at end of file
diff --git a/test/runtime/samples/spread-element-multiple/main.html b/test/runtime/samples/spread-element-multiple/main.html
index d43564397b..97272e6946 100644
--- a/test/runtime/samples/spread-element-multiple/main.html
+++ b/test/runtime/samples/spread-element-multiple/main.html
@@ -1 +1 @@
-<div {{...a}} data-b="b" {{...c}} data-d={{d}} >test</div>
\ No newline at end of file
+<div {...a} data-b="b" {...c} data-d={d} >test</div>
\ No newline at end of file
diff --git a/test/runtime/samples/spread-element/main.html b/test/runtime/samples/spread-element/main.html
index 8f3dbae7d5..391566826f 100644
--- a/test/runtime/samples/spread-element/main.html
+++ b/test/runtime/samples/spread-element/main.html
@@ -1,4 +1,4 @@
-<div {{...props}} data-named="value">{{color}}</div>
+<div {...props} data-named="value">{color}</div>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/state-deconflicted/main.html b/test/runtime/samples/state-deconflicted/main.html
index b5ce111cae..12ff80a0ed 100644
--- a/test/runtime/samples/state-deconflicted/main.html
+++ b/test/runtime/samples/state-deconflicted/main.html
@@ -1,7 +1,7 @@
-<p>Current state: {{state}}</p>
+<p>Current state: {state}</p>
 
 <ul>
-	{{#each states as state}}
-		<li>{{state}}</li>
-	{{/each}}
+	{#each states as state}
+		<li>{state}</li>
+	{/each}
 </ul>
\ No newline at end of file
diff --git a/test/runtime/samples/store-binding/main.html b/test/runtime/samples/store-binding/main.html
index 06410ea770..0f9e902bf3 100644
--- a/test/runtime/samples/store-binding/main.html
+++ b/test/runtime/samples/store-binding/main.html
@@ -1,4 +1,4 @@
-<h1>Hello {{$name}}!</h1>
+<h1>Hello {$name}!</h1>
 <NameInput/>
 
 <script>
diff --git a/test/runtime/samples/store-component-binding-deep/main.html b/test/runtime/samples/store-component-binding-deep/main.html
index f77016b549..578c14cedb 100644
--- a/test/runtime/samples/store-component-binding-deep/main.html
+++ b/test/runtime/samples/store-component-binding-deep/main.html
@@ -1,4 +1,4 @@
-<h1>Hello {{$name.value}}!</h1>
+<h1>Hello {$name.value}!</h1>
 <TextInput bind:value=$name.value/>
 
 <script>
diff --git a/test/runtime/samples/store-component-binding-each/main.html b/test/runtime/samples/store-component-binding-each/main.html
index e150c57af8..01be9e6b45 100644
--- a/test/runtime/samples/store-component-binding-each/main.html
+++ b/test/runtime/samples/store-component-binding-each/main.html
@@ -1,8 +1,8 @@
-{{#each $a as x}}
+{#each $a as x}
 	<Widget bind:value='x'/>
-{{/each}}
+{/each}
 
-<p>{{$a.join(', ')}}</p>
+<p>{$a.join(', ')}</p>
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/store-component-binding/main.html b/test/runtime/samples/store-component-binding/main.html
index aaebf609d2..8abfd6c239 100644
--- a/test/runtime/samples/store-component-binding/main.html
+++ b/test/runtime/samples/store-component-binding/main.html
@@ -1,4 +1,4 @@
-<h1>Hello {{$name}}!</h1>
+<h1>Hello {$name}!</h1>
 <TextInput bind:value=$name/>
 
 <script>
diff --git a/test/runtime/samples/store-computed/Todo.html b/test/runtime/samples/store-computed/Todo.html
index 2ad67420ca..c665d86d32 100644
--- a/test/runtime/samples/store-computed/Todo.html
+++ b/test/runtime/samples/store-computed/Todo.html
@@ -1,11 +1,11 @@
-{{#if isVisible}}
-	<div class='{{todo.done ? "done": "pending"}}'>{{todo.description}}</div>
-{{/if}}
+{#if isVisible}
+	<div class='{todo.done ? "done": "pending"}'>{todo.description}</div>
+{/if}
 
 <script>
 	export default {
 		computed: {
-			isVisible: ($filter, todo) => {
+			isVisible: ({ $filter, todo }) => {
 				if ($filter === 'all') return true;
 				if ($filter === 'done') return todo.done;
 				if ($filter === 'pending') return !todo.done;
diff --git a/test/runtime/samples/store-computed/main.html b/test/runtime/samples/store-computed/main.html
index 5c50839ba3..42af517dde 100644
--- a/test/runtime/samples/store-computed/main.html
+++ b/test/runtime/samples/store-computed/main.html
@@ -1,6 +1,6 @@
-{{#each $todos as todo}}
-	<Todo :todo/>
-{{/each}}
+{#each $todos as todo}
+	<Todo {todo}/>
+{/each}
 
 <script>
 	import Todo from './Todo.html';
diff --git a/test/runtime/samples/store-event/main.html b/test/runtime/samples/store-event/main.html
index 06410ea770..0f9e902bf3 100644
--- a/test/runtime/samples/store-event/main.html
+++ b/test/runtime/samples/store-event/main.html
@@ -1,4 +1,4 @@
-<h1>Hello {{$name}}!</h1>
+<h1>Hello {$name}!</h1>
 <NameInput/>
 
 <script>
diff --git a/test/runtime/samples/store-nested/Nested.html b/test/runtime/samples/store-nested/Nested.html
index 01662eceac..0ba00df434 100644
--- a/test/runtime/samples/store-nested/Nested.html
+++ b/test/runtime/samples/store-nested/Nested.html
@@ -1,4 +1,4 @@
-<h1>Hello, {{$name}}!</h1>
+<h1>Hello, {$name}!</h1>
 
 <script>
 	import { Store } from '../../../../store.js';
diff --git a/test/runtime/samples/store-onstate-dollar/main.html b/test/runtime/samples/store-onstate-dollar/main.html
index 28154934b8..ddb69c2148 100644
--- a/test/runtime/samples/store-onstate-dollar/main.html
+++ b/test/runtime/samples/store-onstate-dollar/main.html
@@ -1 +1 @@
-<h1>Hello {{$name}}!</h1>
\ No newline at end of file
+<h1>Hello {$name}!</h1>
\ No newline at end of file
diff --git a/test/runtime/samples/store-root/Nested.html b/test/runtime/samples/store-root/Nested.html
index 98d2077280..2bee21b9b1 100644
--- a/test/runtime/samples/store-root/Nested.html
+++ b/test/runtime/samples/store-root/Nested.html
@@ -1 +1 @@
-<p>It's nice to see you, {{$name}}.</p>
\ No newline at end of file
+<p>It's nice to see you, {$name}.</p>
\ No newline at end of file
diff --git a/test/runtime/samples/store-root/main.html b/test/runtime/samples/store-root/main.html
index de16851d9a..b880433bee 100644
--- a/test/runtime/samples/store-root/main.html
+++ b/test/runtime/samples/store-root/main.html
@@ -1,4 +1,4 @@
-<h1>Hello {{$name}}!</h1>
+<h1>Hello {$name}!</h1>
 <Nested/>
 
 <script>
diff --git a/test/runtime/samples/store/main.html b/test/runtime/samples/store/main.html
index 28154934b8..ddb69c2148 100644
--- a/test/runtime/samples/store/main.html
+++ b/test/runtime/samples/store/main.html
@@ -1 +1 @@
-<h1>Hello {{$name}}!</h1>
\ No newline at end of file
+<h1>Hello {$name}!</h1>
\ No newline at end of file
diff --git a/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/Rect.html b/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/Rect.html
index 0813c3c143..143b2f8223 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/Rect.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/Rect.html
@@ -1,4 +1,4 @@
-<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/main.html b/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/main.html
index 7bef9787b0..6ae6ad8590 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/main.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace-backtick-string/main.html
@@ -1,5 +1,5 @@
 <svg>
-	<Rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+	<Rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 </svg>
 
 <script>
diff --git a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
index c158d7fdf5..536f47107e 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
@@ -1,4 +1,4 @@
-<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/main.html b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/main.html
index 7bef9787b0..6ae6ad8590 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/main.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/main.html
@@ -1,5 +1,5 @@
 <svg>
-	<Rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+	<Rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 </svg>
 
 <script>
diff --git a/test/runtime/samples/svg-child-component-declared-namespace/Rect.html b/test/runtime/samples/svg-child-component-declared-namespace/Rect.html
index 9f54e90c4d..d6c96e8e49 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace/Rect.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace/Rect.html
@@ -1,4 +1,4 @@
-<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/svg-child-component-declared-namespace/main.html b/test/runtime/samples/svg-child-component-declared-namespace/main.html
index 7bef9787b0..6ae6ad8590 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace/main.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace/main.html
@@ -1,5 +1,5 @@
 <svg>
-	<Rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+	<Rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 </svg>
 
 <script>
diff --git a/test/runtime/samples/svg-each-block-anchor/main.html b/test/runtime/samples/svg-each-block-anchor/main.html
index 7a299b2c11..f9e4a57bd8 100644
--- a/test/runtime/samples/svg-each-block-anchor/main.html
+++ b/test/runtime/samples/svg-each-block-anchor/main.html
@@ -1,9 +1,9 @@
 <svg>
-	{{#each foo as x}}
+	{#each foo as x}
 		<g class='foo'></g>
-	{{/each}}
+	{/each}
 
-	{{#each bar as y}}
+	{#each bar as y}
 		<g class='bar'></g>
-	{{/each}}
+	{/each}
 </svg>
\ No newline at end of file
diff --git a/test/runtime/samples/svg-each-block-namespace/main.html b/test/runtime/samples/svg-each-block-namespace/main.html
index 95e5443d1e..4a85ffb641 100644
--- a/test/runtime/samples/svg-each-block-namespace/main.html
+++ b/test/runtime/samples/svg-each-block-namespace/main.html
@@ -1,7 +1,7 @@
 <svg>
-	{{#each colours as colour, i}}
-		<circle cx='{{i * 100}}' cy='100' r='100' fill='{{colour}}'/>
-	{{/each}}
+	{#each colours as colour, i}
+		<circle cx='{i * 100}' cy='100' r='100' fill='{colour}'/>
+	{/each}
 </svg>
 
 <script>
diff --git a/test/runtime/samples/svg-multiple/main.html b/test/runtime/samples/svg-multiple/main.html
index 2998701d4b..93b980cf89 100644
--- a/test/runtime/samples/svg-multiple/main.html
+++ b/test/runtime/samples/svg-multiple/main.html
@@ -1,7 +1,7 @@
 <svg>
-	<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+	<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 </svg>
 
 <svg>
-	<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+	<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 </svg>
diff --git a/test/runtime/samples/svg-with-style/main.html b/test/runtime/samples/svg-with-style/main.html
index 24c7f4487c..2d5df24f38 100644
--- a/test/runtime/samples/svg-with-style/main.html
+++ b/test/runtime/samples/svg-with-style/main.html
@@ -1,7 +1,7 @@
 <svg>
 	<circle cx=50 cy=50 r=50/>
 	<circle class='foo' cx=150 cy=50 r=50/>
-	<circle class='{{x}}' cx=250 cy=50 r=50/>
+	<circle class='{x}' cx=250 cy=50 r=50/>
 </svg>
 
 <style>
diff --git a/test/runtime/samples/svg-xmlns/main.html b/test/runtime/samples/svg-xmlns/main.html
index 29e96293a5..34d5bae10b 100644
--- a/test/runtime/samples/svg-xmlns/main.html
+++ b/test/runtime/samples/svg-xmlns/main.html
@@ -1,3 +1,3 @@
 <svg xmlns='http://www.w3.org/2000/svg'>
-	<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+	<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 </svg>
diff --git a/test/runtime/samples/svg/main.html b/test/runtime/samples/svg/main.html
index 106d1c8805..22f7abf20c 100644
--- a/test/runtime/samples/svg/main.html
+++ b/test/runtime/samples/svg/main.html
@@ -1,3 +1,3 @@
 <svg>
-	<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+	<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 </svg>
diff --git a/test/runtime/samples/textarea-children/main.html b/test/runtime/samples/textarea-children/main.html
index de50c807d6..6cc3072e5c 100644
--- a/test/runtime/samples/textarea-children/main.html
+++ b/test/runtime/samples/textarea-children/main.html
@@ -1,3 +1,3 @@
 <textarea>
-	<p>not actually an element. {{foo}}</p>
+	<p>not actually an element. {foo}</p>
 </textarea>
\ No newline at end of file
diff --git a/test/runtime/samples/textarea-value/main.html b/test/runtime/samples/textarea-value/main.html
index 215166ab10..9ba2506e48 100644
--- a/test/runtime/samples/textarea-value/main.html
+++ b/test/runtime/samples/textarea-value/main.html
@@ -1 +1 @@
-<textarea value='{{foo}}'/>
\ No newline at end of file
+<textarea value='{foo}'/>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-css-delay/main.html b/test/runtime/samples/transition-css-delay/main.html
index cd46050a9f..46a46aa527 100644
--- a/test/runtime/samples/transition-css-delay/main.html
+++ b/test/runtime/samples/transition-css-delay/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
+{#if visible}
 	<div transition:foo>delayed</div>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-css-duration/main.html b/test/runtime/samples/transition-css-duration/main.html
index d3eb2bee78..e10df79f55 100644
--- a/test/runtime/samples/transition-css-duration/main.html
+++ b/test/runtime/samples/transition-css-duration/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
+{#if visible}
 	<div transition:foo></div>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-delay-in-out/main.html b/test/runtime/samples/transition-js-delay-in-out/main.html
index 6a0a3f88a7..43400fd67e 100644
--- a/test/runtime/samples/transition-js-delay-in-out/main.html
+++ b/test/runtime/samples/transition-js-delay-in-out/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
+{#if visible}
 	<div in:foo out:bar>delayed</div>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-delay/main.html b/test/runtime/samples/transition-js-delay/main.html
index a4277f34ce..1db651008d 100644
--- a/test/runtime/samples/transition-js-delay/main.html
+++ b/test/runtime/samples/transition-js-delay/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
+{#if visible}
 	<div transition:foo>delayed</div>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-dynamic-if-block-bidi/main.html b/test/runtime/samples/transition-js-dynamic-if-block-bidi/main.html
index 576b4efc2e..fba00bcd38 100644
--- a/test/runtime/samples/transition-js-dynamic-if-block-bidi/main.html
+++ b/test/runtime/samples/transition-js-dynamic-if-block-bidi/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
-	<div transition:foo>hello {{name}}!</div>
-{{/if}}
+{#if visible}
+	<div transition:foo>hello {name}!</div>
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-each-block-intro-outro/main.html b/test/runtime/samples/transition-js-each-block-intro-outro/main.html
index 9652a43859..08b2398408 100644
--- a/test/runtime/samples/transition-js-each-block-intro-outro/main.html
+++ b/test/runtime/samples/transition-js-each-block-intro-outro/main.html
@@ -1,8 +1,8 @@
-{{#each things as thing}}
-	{{#if visible}}
-		<div in:foo out:bar>{{thing}}</div>
-	{{/if}}
-{{/each}}
+{#each things as thing}
+	{#if visible}
+		<div in:foo out:bar>{thing}</div>
+	{/if}
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-each-block-intro/main.html b/test/runtime/samples/transition-js-each-block-intro/main.html
index 7f12ef1d8f..4264a2d684 100644
--- a/test/runtime/samples/transition-js-each-block-intro/main.html
+++ b/test/runtime/samples/transition-js-each-block-intro/main.html
@@ -1,6 +1,6 @@
-{{#each things as thing}}
-	<div in:foo>{{thing}}</div>
-{{/each}}
+{#each things as thing}
+	<div in:foo>{thing}</div>
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-each-block-keyed-intro-outro/main.html b/test/runtime/samples/transition-js-each-block-keyed-intro-outro/main.html
index c755bb12e6..111f081d97 100644
--- a/test/runtime/samples/transition-js-each-block-keyed-intro-outro/main.html
+++ b/test/runtime/samples/transition-js-each-block-keyed-intro-outro/main.html
@@ -1,6 +1,6 @@
-{{#each things as thing @name}}
-	<div transition:foo>{{thing.name}}</div>
-{{/each}}
+{#each things as thing (thing.name)}
+	<div transition:foo>{thing.name}</div>
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-each-block-keyed-intro/main.html b/test/runtime/samples/transition-js-each-block-keyed-intro/main.html
index d9442d0d6f..f6a89b5b0a 100644
--- a/test/runtime/samples/transition-js-each-block-keyed-intro/main.html
+++ b/test/runtime/samples/transition-js-each-block-keyed-intro/main.html
@@ -1,6 +1,6 @@
-{{#each things as thing @name}}
-	<div in:foo>{{thing.name}}</div>
-{{/each}}
+{#each things as thing (thing.name)}
+	<div in:foo>{thing.name}</div>
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-each-block-keyed-outro/main.html b/test/runtime/samples/transition-js-each-block-keyed-outro/main.html
index 2e73512529..e0d9722cf7 100644
--- a/test/runtime/samples/transition-js-each-block-keyed-outro/main.html
+++ b/test/runtime/samples/transition-js-each-block-keyed-outro/main.html
@@ -1,6 +1,6 @@
-{{#each things as thing @name}}
-	<div out:foo>{{thing.name}}</div>
-{{/each}}
+{#each things as thing (thing.name)}
+	<div out:foo>{thing.name}</div>
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-each-block-outro/main.html b/test/runtime/samples/transition-js-each-block-outro/main.html
index 494132c9be..dc8c2dce60 100644
--- a/test/runtime/samples/transition-js-each-block-outro/main.html
+++ b/test/runtime/samples/transition-js-each-block-outro/main.html
@@ -1,6 +1,6 @@
-{{#each things as thing}}
-	<div out:foo>{{thing}}</div>
-{{/each}}
+{#each things as thing}
+	<div out:foo>{thing}</div>
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-events/main.html b/test/runtime/samples/transition-js-events/main.html
index 0436513348..93ab47a8aa 100644
--- a/test/runtime/samples/transition-js-events/main.html
+++ b/test/runtime/samples/transition-js-events/main.html
@@ -1,8 +1,8 @@
-{{#each things as thing}}
-	{{#if visible}}
-		<p transition:foo>{{thing}}</p>
-	{{/if}}
-{{/each}}
+{#each things as thing}
+	{#if visible}
+		<p transition:foo>{thing}</p>
+	{/if}
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-if-block-bidi/main.html b/test/runtime/samples/transition-js-if-block-bidi/main.html
index 31ffd90bc1..379acc128e 100644
--- a/test/runtime/samples/transition-js-if-block-bidi/main.html
+++ b/test/runtime/samples/transition-js-if-block-bidi/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
+{#if visible}
 	<div transition:foo>foo bidi</div>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/main.html b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/main.html
index d68c95e8b0..97a2cb5a04 100644
--- a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/main.html
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/main.html
@@ -1,14 +1,14 @@
-{{#each [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as number}}
-	{{#if foo}}
-		{{#if threshold >= number}}
-			<div transition:foo>{{number}}</div>
-		{{/if}}
-	{{else}}
-		{{#if threshold >= number}}
-			<div transition:foo>{{number}}</div>
-		{{/if}}
-	{{/if}}
-{{/each}}
+{#each [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as number}
+	{#if foo}
+		{#if threshold >= number}
+			<div transition:foo>{number}</div>
+		{/if}
+	{:else}
+		{#if threshold >= number}
+			<div transition:foo>{number}</div>
+		{/if}
+	{/if}
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/main.html b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/main.html
index d68c95e8b0..97a2cb5a04 100644
--- a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/main.html
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/main.html
@@ -1,14 +1,14 @@
-{{#each [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as number}}
-	{{#if foo}}
-		{{#if threshold >= number}}
-			<div transition:foo>{{number}}</div>
-		{{/if}}
-	{{else}}
-		{{#if threshold >= number}}
-			<div transition:foo>{{number}}</div>
-		{{/if}}
-	{{/if}}
-{{/each}}
+{#each [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as number}
+	{#if foo}
+		{#if threshold >= number}
+			<div transition:foo>{number}</div>
+		{/if}
+	{:else}
+		{#if threshold >= number}
+			<div transition:foo>{number}</div>
+		{/if}
+	{/if}
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi/main.html b/test/runtime/samples/transition-js-if-block-in-each-block-bidi/main.html
index 754c4a5bfd..ac9ce0a18f 100644
--- a/test/runtime/samples/transition-js-if-block-in-each-block-bidi/main.html
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi/main.html
@@ -1,8 +1,8 @@
-{{#each [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as number}} 
-	{{#if threshold >= number}}
-		<div transition:foo>{{number}}</div>
-	{{/if}}
-{{/each}}
+{#each [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as number} 
+	{#if threshold >= number}
+		<div transition:foo>{number}</div>
+	{/if}
+{/each}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-if-block-intro-outro/main.html b/test/runtime/samples/transition-js-if-block-intro-outro/main.html
index d752e63722..f9b8cb445c 100644
--- a/test/runtime/samples/transition-js-if-block-intro-outro/main.html
+++ b/test/runtime/samples/transition-js-if-block-intro-outro/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
+{#if visible}
 	<div in:foo out:bar>foo then bar</div>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-if-block-intro/main.html b/test/runtime/samples/transition-js-if-block-intro/main.html
index 9a3b4f34b8..fb089a6c8e 100644
--- a/test/runtime/samples/transition-js-if-block-intro/main.html
+++ b/test/runtime/samples/transition-js-if-block-intro/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
+{#if visible}
 	<div in:fade>fades in</div>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-if-else-block-dynamic-outro/main.html b/test/runtime/samples/transition-js-if-else-block-dynamic-outro/main.html
index aa1ca15fef..495bfe1d3d 100644
--- a/test/runtime/samples/transition-js-if-else-block-dynamic-outro/main.html
+++ b/test/runtime/samples/transition-js-if-else-block-dynamic-outro/main.html
@@ -1,8 +1,8 @@
-{{#if x}}
-	<div ref:yes out:foo>{{z}}</div>
-{{else}}
-	<div ref:no out:foo>{{z}}</div>
-{{/if}}
+{#if x}
+	<div ref:yes out:foo>{z}</div>
+{:else}
+	<div ref:no out:foo>{z}</div>
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-if-else-block-intro/main.html b/test/runtime/samples/transition-js-if-else-block-intro/main.html
index 1b30160b02..0ff96c13e9 100644
--- a/test/runtime/samples/transition-js-if-else-block-intro/main.html
+++ b/test/runtime/samples/transition-js-if-else-block-intro/main.html
@@ -1,8 +1,8 @@
-{{#if x}}
+{#if x}
 	<div ref:yes in:foo>yes</div>
-{{else}}
+{:else}
 	<div ref:no in:foo>no</div>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-if-else-block-outro/main.html b/test/runtime/samples/transition-js-if-else-block-outro/main.html
index 47cc670d1f..29b42fac52 100644
--- a/test/runtime/samples/transition-js-if-else-block-outro/main.html
+++ b/test/runtime/samples/transition-js-if-else-block-outro/main.html
@@ -1,8 +1,8 @@
-{{#if x}}
+{#if x}
 	<div ref:yes out:foo>yes</div>
-{{else}}
+{:else}
 	<div ref:no out:foo>no</div>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-if-elseif-block-outro/main.html b/test/runtime/samples/transition-js-if-elseif-block-outro/main.html
index 7b45898ab5..0072736880 100644
--- a/test/runtime/samples/transition-js-if-elseif-block-outro/main.html
+++ b/test/runtime/samples/transition-js-if-elseif-block-outro/main.html
@@ -1,8 +1,8 @@
-{{#if x}}
+{#if x}
 	<div ref:yes out:foo>yes</div>
-{{elseif y}}
+{:elseif y}
 	<div ref:no out:foo>no</div>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-nested-intro/main.html b/test/runtime/samples/transition-js-nested-intro/main.html
index c8bf70b0ae..c06e004c8c 100644
--- a/test/runtime/samples/transition-js-nested-intro/main.html
+++ b/test/runtime/samples/transition-js-nested-intro/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
+{#if visible}
 	<Child>delayed</Child>
-{{/if}}
+{/if}
 
 <script>
 	import Child from './Child.html';
diff --git a/test/runtime/samples/transition-js-parameterised-with-state/main.html b/test/runtime/samples/transition-js-parameterised-with-state/main.html
index 45d9d37a1c..68d036e4da 100644
--- a/test/runtime/samples/transition-js-parameterised-with-state/main.html
+++ b/test/runtime/samples/transition-js-parameterised-with-state/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
+{#if visible}
 	<div transition:foo='{k: duration}'>fades in</div>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/transition-js-parameterised/main.html b/test/runtime/samples/transition-js-parameterised/main.html
index de713ae963..5d9a59f7a7 100644
--- a/test/runtime/samples/transition-js-parameterised/main.html
+++ b/test/runtime/samples/transition-js-parameterised/main.html
@@ -1,6 +1,6 @@
-{{#if visible}}
+{#if visible}
 	<div in:foo='{k: 200}'>fades in</div>
-{{/if}}
+{/if}
 
 <script>
 	export default {
diff --git a/test/runtime/samples/whitespace-each-block/main.html b/test/runtime/samples/whitespace-each-block/main.html
index 372184ebf3..c845c255dd 100644
--- a/test/runtime/samples/whitespace-each-block/main.html
+++ b/test/runtime/samples/whitespace-each-block/main.html
@@ -1 +1 @@
-<h1>Hello <strong>{{name}}! </strong><span>How are you?</span></h1>
+<h1>Hello <strong>{name}! </strong><span>How are you?</span></h1>
diff --git a/test/runtime/samples/whitespace-normal/main.html b/test/runtime/samples/whitespace-normal/main.html
index a2799aa4a0..cf8511fe39 100644
--- a/test/runtime/samples/whitespace-normal/main.html
+++ b/test/runtime/samples/whitespace-normal/main.html
@@ -1,3 +1,3 @@
-{{#each characters as char}}
-	<span>{{char}} </span>
-{{/each}}
\ No newline at end of file
+{#each characters as char}
+	<span>{char} </span>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/window-bind-scroll-update/main-v2.html b/test/runtime/samples/window-bind-scroll-update/main-v2.html
deleted file mode 100644
index 107ebeef8f..0000000000
--- a/test/runtime/samples/window-bind-scroll-update/main-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<svelte:window bind:scrollY/>
-
-<div style='width: 100%; height: 9999px;'></div>
\ No newline at end of file
diff --git a/test/runtime/samples/window-bind-scroll-update/main.html b/test/runtime/samples/window-bind-scroll-update/main.html
index a95028fb7a..107ebeef8f 100644
--- a/test/runtime/samples/window-bind-scroll-update/main.html
+++ b/test/runtime/samples/window-bind-scroll-update/main.html
@@ -1,3 +1,3 @@
-<:Window bind:scrollY/>
+<svelte:window bind:scrollY/>
 
 <div style='width: 100%; height: 9999px;'></div>
\ No newline at end of file
diff --git a/test/runtime/samples/window-binding-resize/main-v2.html b/test/runtime/samples/window-binding-resize/main-v2.html
deleted file mode 100644
index 54a1762eb8..0000000000
--- a/test/runtime/samples/window-binding-resize/main-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<svelte:window bind:innerWidth='width' bind:innerHeight='height'/>
-
-<div>{width}x{height}</div>
\ No newline at end of file
diff --git a/test/runtime/samples/window-binding-resize/main.html b/test/runtime/samples/window-binding-resize/main.html
index e7e682a10c..54a1762eb8 100644
--- a/test/runtime/samples/window-binding-resize/main.html
+++ b/test/runtime/samples/window-binding-resize/main.html
@@ -1,3 +1,3 @@
-<:Window bind:innerWidth='width' bind:innerHeight='height'/>
+<svelte:window bind:innerWidth='width' bind:innerHeight='height'/>
 
-<div>{{width}}x{{height}}</div>
\ No newline at end of file
+<div>{width}x{height}</div>
\ No newline at end of file
diff --git a/test/runtime/samples/window-event-context/main-v2.html b/test/runtime/samples/window-event-context/main-v2.html
deleted file mode 100644
index af60672a2a..0000000000
--- a/test/runtime/samples/window-event-context/main-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<svelte:window on:click='set({ foo: !foo })'/>
-
-{foo}
\ No newline at end of file
diff --git a/test/runtime/samples/window-event-context/main.html b/test/runtime/samples/window-event-context/main.html
index 85cc75f875..af60672a2a 100644
--- a/test/runtime/samples/window-event-context/main.html
+++ b/test/runtime/samples/window-event-context/main.html
@@ -1,3 +1,3 @@
-<:Window on:click='set({ foo: !foo })'/>
+<svelte:window on:click='set({ foo: !foo })'/>
 
-{{foo}}
\ No newline at end of file
+{foo}
\ No newline at end of file
diff --git a/test/runtime/samples/window-event-custom/main-v2.html b/test/runtime/samples/window-event-custom/main-v2.html
deleted file mode 100644
index 515d5bc4ca..0000000000
--- a/test/runtime/samples/window-event-custom/main-v2.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<svelte:window on:esc="set({ escaped: true })" />
-
-<p>escaped: {escaped}</p>
-
-<script>
-	export default {
-		data() {
-			return { escaped: false };
-		},
-
-		events: {
-			esc(node, callback) {
-				function onKeyDown(event) {
-					if (event.which === 27) callback(event);
-				}
-				node.addEventListener('keydown', onKeyDown);
-				return {
-					destroy() {
-						node.removeEventListener('keydown', onKeyDown);
-					}
-				};
-			}
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/runtime/samples/window-event-custom/main.html b/test/runtime/samples/window-event-custom/main.html
index af33d08d97..515d5bc4ca 100644
--- a/test/runtime/samples/window-event-custom/main.html
+++ b/test/runtime/samples/window-event-custom/main.html
@@ -1,6 +1,6 @@
-<:Window on:esc="set({ escaped: true })" />
+<svelte:window on:esc="set({ escaped: true })" />
 
-<p>escaped: {{escaped}}</p>
+<p>escaped: {escaped}</p>
 
 <script>
 	export default {
diff --git a/test/runtime/samples/window-event/main.html b/test/runtime/samples/window-event/main.html
index b6679a0e44..76f5c02084 100644
--- a/test/runtime/samples/window-event/main.html
+++ b/test/runtime/samples/window-event/main.html
@@ -1,3 +1,3 @@
-<:Window on:resize='set({ width: this.innerWidth, height: this.innerHeight })'/>
+<svelte:window on:resize='set({ width: this.innerWidth, height: this.innerHeight })'/>
 
-<div>{{width}}x{{height}}</div>
\ No newline at end of file
+<div>{width}x{height}</div>
\ No newline at end of file