diff --git a/test/js/index.js b/test/js/index.js
index 6a254b16b4..00ef3ead97 100644
--- a/test/js/index.js
+++ b/test/js/index.js
@@ -19,77 +19,62 @@ describe("js", () => {
 			dir = path.resolve("test/js/samples", dir);
 			const config = loadConfig(`${dir}/_config.js`);
 
-			function test(input, v2) {
-				let actual;
+			const input = fs.readFileSync(`${dir}/input.html`, "utf-8").replace(/\s+$/, "");
 
-				try {
-					const options = Object.assign(config.options || {}, {
-						shared: true,
-						parser: v2 ? 'v2' : 'v1'
-					});
+			let actual;
 
-					actual = svelte.compile(input, options).js.code.replace(/generated by Svelte v\d+\.\d+\.\d+/, 'generated by Svelte vX.Y.Z');
-				} catch (err) {
-					console.log(err.frame);
-					throw err;
-				}
+			try {
+				const options = Object.assign(config.options || {}, {
+					shared: true,
+					parser: 'v2' // TODO remove
+				});
+
+				actual = svelte.compile(input, options).js.code.replace(/generated by Svelte v\d+\.\d+\.\d+/, 'generated by Svelte vX.Y.Z');
+			} catch (err) {
+				console.log(err.frame);
+				throw err;
+			}
 
-				const output = `${dir}/_actual${v2 ? '-v2' : ''}.js`;
+			const output = `${dir}/_actual.js`;
 
-				fs.writeFileSync(output, actual);
+			fs.writeFileSync(output, actual);
 
-				return rollup({
-					input: output,
-					plugins: [
-						{
-							resolveId(importee, importer) {
-								if (!importer) return importee;
-								if (importee === "svelte/shared.js")
-									return path.resolve("shared.js");
-								return null;
-							}
+			return rollup({
+				input: output,
+				plugins: [
+					{
+						resolveId(importee, importer) {
+							if (!importer) return importee;
+							if (importee === "svelte/shared.js")
+								return path.resolve("shared.js");
+							return null;
 						}
-					]
-				}).then(bundle => {
-					return bundle.generate({ format: "es" });
-				}).then(({ code }) => {
-					fs.writeFileSync(`${dir}/_actual-bundle${v2 ? '-v2' : ''}.js`, code);
+					}
+				]
+			}).then(bundle => {
+				return bundle.generate({ format: "es" });
+			}).then(({ code }) => {
+				fs.writeFileSync(`${dir}/_actual-bundle.js`, code);
 
-					const expected = fs.readFileSync(`${dir}/expected${v2 ? '-v2' : ''}.js`, "utf-8");
-					const expectedBundle = fs.readFileSync(
-						`${dir}/expected-bundle${v2 ? '-v2' : ''}.js`,
-						"utf-8"
-					);
+				const expected = fs.readFileSync(`${dir}/expected.js`, "utf-8");
+				const expectedBundle = fs.readFileSync(
+					`${dir}/expected-bundle.js`,
+					"utf-8"
+				);
 
-					assert.equal(
-						actual.trim().replace(/^[ \t]+$/gm, ""),
-						expected.trim().replace(/^[ \t]+$/gm, "")
-					);
+				assert.equal(
+					actual.trim().replace(/^[ \t]+$/gm, ""),
+					expected.trim().replace(/^[ \t]+$/gm, "")
+				);
 
-					assert.equal(
-						code.trim().replace(/^[ \t]+$/gm, ""),
-						expectedBundle.trim().replace(/^[ \t]+$/gm, "")
-					);
-				}).catch(err => {
-					if (err.loc) console.error(err.loc);
-					throw err;
-				});
-			}
-
-			return Promise.resolve()
-				.then(() => {
-					return test(
-						fs.readFileSync(`${dir}/input.html`, "utf-8").replace(/\s+$/, "")
-					);
-				})
-				.then(() => {
-					if (fs.existsSync(`${dir}/input-v2.html`)) {
-						return test(
-							fs.readFileSync(`${dir}/input-v2.html`, "utf-8").replace(/\s+$/, ""),
-							'v2'
-						);
-					}
-				});
+				assert.equal(
+					code.trim().replace(/^[ \t]+$/gm, ""),
+					expectedBundle.trim().replace(/^[ \t]+$/gm, "")
+				);
+			}).catch(err => {
+				if (err.loc) console.error(err.loc);
+				throw err;
+			});
 		});
 	});
 });
diff --git a/test/js/samples/collapses-text-around-comments/_actual-bundle-v2.js b/test/js/samples/collapses-text-around-comments/_actual-bundle-v2.js
deleted file mode 100644
index ed6fef0f3d..0000000000
--- a/test/js/samples/collapses-text-around-comments/_actual-bundle-v2.js
+++ /dev/null
@@ -1,204 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function data() {
-	return { foo: 42 }
-}
-function add_css() {
-	var style = createElement("style");
-	style.id = 'svelte-1a7i8ec-style';
-	style.textContent = "p.svelte-1a7i8ec,.svelte-1a7i8ec p{color:red}";
-	appendNode(style, document.head);
-}
-
-function create_main_fragment(component, state) {
-	var p, text;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			text = createText(state.foo);
-			this.h();
-		},
-
-		h: function hydrate() {
-			p.className = "svelte-1a7i8ec";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-			appendNode(text, p);
-		},
-
-		p: function update(changed, state) {
-			if (changed.foo) {
-				text.data = state.foo;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign(data(), options.data);
-
-	if (!document.getElementById("svelte-1a7i8ec-style")) add_css();
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle-v2.js b/test/js/samples/collapses-text-around-comments/expected-bundle-v2.js
deleted file mode 100644
index ed6fef0f3d..0000000000
--- a/test/js/samples/collapses-text-around-comments/expected-bundle-v2.js
+++ /dev/null
@@ -1,204 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function data() {
-	return { foo: 42 }
-}
-function add_css() {
-	var style = createElement("style");
-	style.id = 'svelte-1a7i8ec-style';
-	style.textContent = "p.svelte-1a7i8ec,.svelte-1a7i8ec p{color:red}";
-	appendNode(style, document.head);
-}
-
-function create_main_fragment(component, state) {
-	var p, text;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			text = createText(state.foo);
-			this.h();
-		},
-
-		h: function hydrate() {
-			p.className = "svelte-1a7i8ec";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-			appendNode(text, p);
-		},
-
-		p: function update(changed, state) {
-			if (changed.foo) {
-				text.data = state.foo;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign(data(), options.data);
-
-	if (!document.getElementById("svelte-1a7i8ec-style")) add_css();
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/collapses-text-around-comments/expected-v2.js b/test/js/samples/collapses-text-around-comments/expected-v2.js
deleted file mode 100644
index 7bab86334e..0000000000
--- a/test/js/samples/collapses-text-around-comments/expected-v2.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
-
-function data() {
-	return { foo: 42 }
-};
-
-function add_css() {
-	var style = createElement("style");
-	style.id = 'svelte-1a7i8ec-style';
-	style.textContent = "p.svelte-1a7i8ec,.svelte-1a7i8ec p{color:red}";
-	appendNode(style, document.head);
-}
-
-function create_main_fragment(component, state) {
-	var p, text;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			text = createText(state.foo);
-			this.h();
-		},
-
-		h: function hydrate() {
-			p.className = "svelte-1a7i8ec";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-			appendNode(text, p);
-		},
-
-		p: function update(changed, state) {
-			if (changed.foo) {
-				text.data = state.foo;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign(data(), options.data);
-
-	if (!document.getElementById("svelte-1a7i8ec-style")) add_css();
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/collapses-text-around-comments/input-v2.html b/test/js/samples/collapses-text-around-comments/input-v2.html
deleted file mode 100644
index 54c15b7922..0000000000
--- a/test/js/samples/collapses-text-around-comments/input-v2.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-<!-- a -->
-
-<!-- b -->
-
-<p>{foo}</p>
-
-<!-- c -->
-
-<!-- d -->
-
-<style>
-	p {
-		color: red;
-	}
-</style>
-
-<!-- e -->
-
-<script>
-	export default {
-		data: function () {
-			return { foo: 42 }
-		}
-	};
-</script>
-
-<!-- f -->
-
-<!-- g -->
\ No newline at end of file
diff --git a/test/js/samples/collapses-text-around-comments/input.html b/test/js/samples/collapses-text-around-comments/input.html
index a6c1ae40f7..54c15b7922 100644
--- a/test/js/samples/collapses-text-around-comments/input.html
+++ b/test/js/samples/collapses-text-around-comments/input.html
@@ -3,7 +3,7 @@
 
 <!-- b -->
 
-<p>{{foo}}</p>
+<p>{foo}</p>
 
 <!-- c -->
 
diff --git a/test/js/samples/computed-collapsed-if/expected-bundle.js b/test/js/samples/computed-collapsed-if/expected-bundle.js
index 5347ce59a1..8cd4bf0011 100644
--- a/test/js/samples/computed-collapsed-if/expected-bundle.js
+++ b/test/js/samples/computed-collapsed-if/expected-bundle.js
@@ -122,11 +122,11 @@ var proto = {
 
 /* generated by Svelte vX.Y.Z */
 
-function a(x) {
+function a({ x }) {
 	return x * 2;
 }
 
-function b(x) {
+function b({ x }) {
 	return x * 3;
 }
 
@@ -162,8 +162,8 @@ assign(SvelteComponent.prototype, proto);
 
 SvelteComponent.prototype._recompute = function _recompute(changed, state) {
 	if (changed.x) {
-		if (this._differs(state.a, (state.a = a(state.x)))) changed.a = true;
-		if (this._differs(state.b, (state.b = b(state.x)))) changed.b = true;
+		if (this._differs(state.a, (state.a = a(state)))) changed.a = true;
+		if (this._differs(state.b, (state.b = b(state)))) changed.b = true;
 	}
 };
 
diff --git a/test/js/samples/computed-collapsed-if/expected.js b/test/js/samples/computed-collapsed-if/expected.js
index 2398f4bdee..f1228ca0b6 100644
--- a/test/js/samples/computed-collapsed-if/expected.js
+++ b/test/js/samples/computed-collapsed-if/expected.js
@@ -1,11 +1,11 @@
 /* generated by Svelte vX.Y.Z */
 import { assign, init, noop, proto } from "svelte/shared.js";
 
-function a(x) {
+function a({ x }) {
 	return x * 2;
 }
 
-function b(x) {
+function b({ x }) {
 	return x * 3;
 }
 
@@ -41,8 +41,8 @@ assign(SvelteComponent.prototype, proto);
 
 SvelteComponent.prototype._recompute = function _recompute(changed, state) {
 	if (changed.x) {
-		if (this._differs(state.a, (state.a = a(state.x)))) changed.a = true;
-		if (this._differs(state.b, (state.b = b(state.x)))) changed.b = true;
+		if (this._differs(state.a, (state.a = a(state)))) changed.a = true;
+		if (this._differs(state.b, (state.b = b(state)))) changed.b = true;
 	}
 }
 export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/computed-collapsed-if/input.html b/test/js/samples/computed-collapsed-if/input.html
index a68513b860..c7280e5ef8 100644
--- a/test/js/samples/computed-collapsed-if/input.html
+++ b/test/js/samples/computed-collapsed-if/input.html
@@ -1,8 +1,8 @@
 <script>
 	export default {
 		computed: {
-			a: x => x * 2,
-			b: x => x * 3
+			a: ({ x }) => x * 2,
+			b: ({ x }) => x * 3
 		}
 	};
 </script>
\ No newline at end of file
diff --git a/test/js/samples/deconflict-builtins/_actual-bundle-v2.js b/test/js/samples/deconflict-builtins/_actual-bundle-v2.js
deleted file mode 100644
index 2f9dd2db1d..0000000000
--- a/test/js/samples/deconflict-builtins/_actual-bundle-v2.js
+++ /dev/null
@@ -1,276 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function destroyEach(iterations) {
-	for (var i = 0; i < iterations.length; i += 1) {
-		if (iterations[i]) iterations[i].d();
-	}
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function createComment() {
-	return document.createComment('');
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var each_anchor;
-
-	var each_value = state.createElement;
-
-	var each_blocks = [];
-
-	for (var i = 0; i < each_value.length; i += 1) {
-		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
-			each_value: each_value,
-			node: each_value[i],
-			node_index: i
-		}));
-	}
-
-	return {
-		c: function create() {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].c();
-			}
-
-			each_anchor = createComment();
-		},
-
-		m: function mount(target, anchor) {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
-			}
-
-			insertNode(each_anchor, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			var each_value = state.createElement;
-
-			if (changed.createElement) {
-				for (var i = 0; i < each_value.length; i += 1) {
-					var each_context = assign(assign({}, state), {
-						each_value: each_value,
-						node: each_value[i],
-						node_index: i
-					});
-
-					if (each_blocks[i]) {
-						each_blocks[i].p(changed, each_context);
-					} else {
-						each_blocks[i] = create_each_block(component, each_context);
-						each_blocks[i].c();
-						each_blocks[i].m(each_anchor.parentNode, each_anchor);
-					}
-				}
-
-				for (; i < each_blocks.length; i += 1) {
-					each_blocks[i].u();
-					each_blocks[i].d();
-				}
-				each_blocks.length = each_value.length;
-			}
-		},
-
-		u: function unmount() {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].u();
-			}
-
-			detachNode(each_anchor);
-		},
-
-		d: function destroy$$1() {
-			destroyEach(each_blocks);
-		}
-	};
-}
-
-// (1:0) {#each createElement as node}
-function create_each_block(component, state) {
-	var node = state.node, each_value = state.each_value, node_index = state.node_index;
-	var span, text_value = node, text;
-
-	return {
-		c: function create() {
-			span = createElement("span");
-			text = createText(text_value);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(span, target, anchor);
-			appendNode(text, span);
-		},
-
-		p: function update(changed, state) {
-			node = state.node;
-			each_value = state.each_value;
-			node_index = state.node_index;
-			if ((changed.createElement) && text_value !== (text_value = node)) {
-				text.data = text_value;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(span);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/deconflict-builtins/expected-bundle-v2.js b/test/js/samples/deconflict-builtins/expected-bundle-v2.js
deleted file mode 100644
index 2f9dd2db1d..0000000000
--- a/test/js/samples/deconflict-builtins/expected-bundle-v2.js
+++ /dev/null
@@ -1,276 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function destroyEach(iterations) {
-	for (var i = 0; i < iterations.length; i += 1) {
-		if (iterations[i]) iterations[i].d();
-	}
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function createComment() {
-	return document.createComment('');
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var each_anchor;
-
-	var each_value = state.createElement;
-
-	var each_blocks = [];
-
-	for (var i = 0; i < each_value.length; i += 1) {
-		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
-			each_value: each_value,
-			node: each_value[i],
-			node_index: i
-		}));
-	}
-
-	return {
-		c: function create() {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].c();
-			}
-
-			each_anchor = createComment();
-		},
-
-		m: function mount(target, anchor) {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
-			}
-
-			insertNode(each_anchor, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			var each_value = state.createElement;
-
-			if (changed.createElement) {
-				for (var i = 0; i < each_value.length; i += 1) {
-					var each_context = assign(assign({}, state), {
-						each_value: each_value,
-						node: each_value[i],
-						node_index: i
-					});
-
-					if (each_blocks[i]) {
-						each_blocks[i].p(changed, each_context);
-					} else {
-						each_blocks[i] = create_each_block(component, each_context);
-						each_blocks[i].c();
-						each_blocks[i].m(each_anchor.parentNode, each_anchor);
-					}
-				}
-
-				for (; i < each_blocks.length; i += 1) {
-					each_blocks[i].u();
-					each_blocks[i].d();
-				}
-				each_blocks.length = each_value.length;
-			}
-		},
-
-		u: function unmount() {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].u();
-			}
-
-			detachNode(each_anchor);
-		},
-
-		d: function destroy$$1() {
-			destroyEach(each_blocks);
-		}
-	};
-}
-
-// (1:0) {#each createElement as node}
-function create_each_block(component, state) {
-	var node = state.node, each_value = state.each_value, node_index = state.node_index;
-	var span, text_value = node, text;
-
-	return {
-		c: function create() {
-			span = createElement("span");
-			text = createText(text_value);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(span, target, anchor);
-			appendNode(text, span);
-		},
-
-		p: function update(changed, state) {
-			node = state.node;
-			each_value = state.each_value;
-			node_index = state.node_index;
-			if ((changed.createElement) && text_value !== (text_value = node)) {
-				text.data = text_value;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(span);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/deconflict-builtins/expected-bundle.js b/test/js/samples/deconflict-builtins/expected-bundle.js
index 0bfddd1f0d..2f9dd2db1d 100644
--- a/test/js/samples/deconflict-builtins/expected-bundle.js
+++ b/test/js/samples/deconflict-builtins/expected-bundle.js
@@ -226,7 +226,7 @@ function create_main_fragment(component, state) {
 	};
 }
 
-// (1:0) {{#each createElement as node}}
+// (1:0) {#each createElement as node}
 function create_each_block(component, state) {
 	var node = state.node, each_value = state.each_value, node_index = state.node_index;
 	var span, text_value = node, text;
diff --git a/test/js/samples/deconflict-builtins/expected-v2.js b/test/js/samples/deconflict-builtins/expected-v2.js
deleted file mode 100644
index f6861d2557..0000000000
--- a/test/js/samples/deconflict-builtins/expected-v2.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createComment, createElement, createText, destroyEach, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var each_anchor;
-
-	var each_value = state.createElement;
-
-	var each_blocks = [];
-
-	for (var i = 0; i < each_value.length; i += 1) {
-		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
-			each_value: each_value,
-			node: each_value[i],
-			node_index: i
-		}));
-	}
-
-	return {
-		c: function create() {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].c();
-			}
-
-			each_anchor = createComment();
-		},
-
-		m: function mount(target, anchor) {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
-			}
-
-			insertNode(each_anchor, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			var each_value = state.createElement;
-
-			if (changed.createElement) {
-				for (var i = 0; i < each_value.length; i += 1) {
-					var each_context = assign(assign({}, state), {
-						each_value: each_value,
-						node: each_value[i],
-						node_index: i
-					});
-
-					if (each_blocks[i]) {
-						each_blocks[i].p(changed, each_context);
-					} else {
-						each_blocks[i] = create_each_block(component, each_context);
-						each_blocks[i].c();
-						each_blocks[i].m(each_anchor.parentNode, each_anchor);
-					}
-				}
-
-				for (; i < each_blocks.length; i += 1) {
-					each_blocks[i].u();
-					each_blocks[i].d();
-				}
-				each_blocks.length = each_value.length;
-			}
-		},
-
-		u: function unmount() {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].u();
-			}
-
-			detachNode(each_anchor);
-		},
-
-		d: function destroy() {
-			destroyEach(each_blocks);
-		}
-	};
-}
-
-// (1:0) {#each createElement as node}
-function create_each_block(component, state) {
-	var node = state.node, each_value = state.each_value, node_index = state.node_index;
-	var span, text_value = node, text;
-
-	return {
-		c: function create() {
-			span = createElement("span");
-			text = createText(text_value);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(span, target, anchor);
-			appendNode(text, span);
-		},
-
-		p: function update(changed, state) {
-			node = state.node;
-			each_value = state.each_value;
-			node_index = state.node_index;
-			if ((changed.createElement) && text_value !== (text_value = node)) {
-				text.data = text_value;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(span);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/deconflict-builtins/expected.js b/test/js/samples/deconflict-builtins/expected.js
index e81e05fd32..f6861d2557 100644
--- a/test/js/samples/deconflict-builtins/expected.js
+++ b/test/js/samples/deconflict-builtins/expected.js
@@ -75,7 +75,7 @@ function create_main_fragment(component, state) {
 	};
 }
 
-// (1:0) {{#each createElement as node}}
+// (1:0) {#each createElement as node}
 function create_each_block(component, state) {
 	var node = state.node, each_value = state.each_value, node_index = state.node_index;
 	var span, text_value = node, text;
diff --git a/test/js/samples/deconflict-builtins/input-v2.html b/test/js/samples/deconflict-builtins/input-v2.html
deleted file mode 100644
index 48a413b323..0000000000
--- a/test/js/samples/deconflict-builtins/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{#each createElement as node}
-	<span>{node}</span>
-{/each}
\ No newline at end of file
diff --git a/test/js/samples/deconflict-builtins/input.html b/test/js/samples/deconflict-builtins/input.html
index a6556d00c5..48a413b323 100644
--- a/test/js/samples/deconflict-builtins/input.html
+++ b/test/js/samples/deconflict-builtins/input.html
@@ -1,3 +1,3 @@
-{{#each createElement as node}}
-	<span>{{node}}</span>
-{{/each}}
\ No newline at end of file
+{#each createElement as node}
+	<span>{node}</span>
+{/each}
\ No newline at end of file
diff --git a/test/js/samples/dev-warning-missing-data-computed/_actual-bundle-v2.js b/test/js/samples/dev-warning-missing-data-computed/_actual-bundle-v2.js
deleted file mode 100644
index e0ff6a1171..0000000000
--- a/test/js/samples/dev-warning-missing-data-computed/_actual-bundle-v2.js
+++ /dev/null
@@ -1,232 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function destroyDev(detach) {
-	destroy.call(this, detach);
-	this.destroy = function() {
-		console.warn('Component was already destroyed');
-	};
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function setDev(newState) {
-	if (typeof newState !== 'object') {
-		throw new Error(
-			this._debugName + '.set was called without an object of data key-values to update.'
-		);
-	}
-
-	this._checkReadOnly(newState);
-	set.call(this, newState);
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var protoDev = {
-	destroy: destroyDev,
-	get,
-	fire,
-	on,
-	set: setDev,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function bar({ foo }) {
-	return foo * 2;
-}
-
-function create_main_fragment(component, state) {
-	var p, text_value = state.Math.max(0, state.foo), text, text_1, text_2;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			text = createText(text_value);
-			text_1 = createText("\n\t");
-			text_2 = createText(state.bar);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-			appendNode(text, p);
-			appendNode(text_1, p);
-			appendNode(text_2, p);
-		},
-
-		p: function update(changed, state) {
-			if ((changed.Math || changed.foo) && text_value !== (text_value = state.Math.max(0, state.foo))) {
-				text.data = text_value;
-			}
-
-			if (changed.bar) {
-				text_2.data = state.bar;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	this._debugName = '<SvelteComponent>';
-	if (!options || (!options.target && !options.root)) throw new Error("'target' is a required option");
-	init(this, options);
-	this._state = assign({ Math : Math }, options.data);
-	this._recompute({ foo: 1 }, this._state);
-	if (!('foo' in this._state)) console.warn("<SvelteComponent> was created without expected data property 'foo'");
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		if (options.hydrate) throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, protoDev);
-
-SvelteComponent.prototype._checkReadOnly = function _checkReadOnly(newState) {
-	if ('bar' in newState && !this._updatingReadonlyProperty) throw new Error("<SvelteComponent>: Cannot set read-only property 'bar'");
-};
-
-SvelteComponent.prototype._recompute = function _recompute(changed, state) {
-	if (changed.foo) {
-		if (this._differs(state.bar, (state.bar = bar(state)))) changed.bar = true;
-	}
-};
-
-export default SvelteComponent;
diff --git a/test/js/samples/dev-warning-missing-data-computed/expected-bundle-v2.js b/test/js/samples/dev-warning-missing-data-computed/expected-bundle-v2.js
deleted file mode 100644
index e0ff6a1171..0000000000
--- a/test/js/samples/dev-warning-missing-data-computed/expected-bundle-v2.js
+++ /dev/null
@@ -1,232 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function destroyDev(detach) {
-	destroy.call(this, detach);
-	this.destroy = function() {
-		console.warn('Component was already destroyed');
-	};
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function setDev(newState) {
-	if (typeof newState !== 'object') {
-		throw new Error(
-			this._debugName + '.set was called without an object of data key-values to update.'
-		);
-	}
-
-	this._checkReadOnly(newState);
-	set.call(this, newState);
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var protoDev = {
-	destroy: destroyDev,
-	get,
-	fire,
-	on,
-	set: setDev,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function bar({ foo }) {
-	return foo * 2;
-}
-
-function create_main_fragment(component, state) {
-	var p, text_value = state.Math.max(0, state.foo), text, text_1, text_2;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			text = createText(text_value);
-			text_1 = createText("\n\t");
-			text_2 = createText(state.bar);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-			appendNode(text, p);
-			appendNode(text_1, p);
-			appendNode(text_2, p);
-		},
-
-		p: function update(changed, state) {
-			if ((changed.Math || changed.foo) && text_value !== (text_value = state.Math.max(0, state.foo))) {
-				text.data = text_value;
-			}
-
-			if (changed.bar) {
-				text_2.data = state.bar;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	this._debugName = '<SvelteComponent>';
-	if (!options || (!options.target && !options.root)) throw new Error("'target' is a required option");
-	init(this, options);
-	this._state = assign({ Math : Math }, options.data);
-	this._recompute({ foo: 1 }, this._state);
-	if (!('foo' in this._state)) console.warn("<SvelteComponent> was created without expected data property 'foo'");
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		if (options.hydrate) throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, protoDev);
-
-SvelteComponent.prototype._checkReadOnly = function _checkReadOnly(newState) {
-	if ('bar' in newState && !this._updatingReadonlyProperty) throw new Error("<SvelteComponent>: Cannot set read-only property 'bar'");
-};
-
-SvelteComponent.prototype._recompute = function _recompute(changed, state) {
-	if (changed.foo) {
-		if (this._differs(state.bar, (state.bar = bar(state)))) changed.bar = true;
-	}
-};
-
-export default SvelteComponent;
diff --git a/test/js/samples/dev-warning-missing-data-computed/expected-bundle.js b/test/js/samples/dev-warning-missing-data-computed/expected-bundle.js
index effef47cb9..e0ff6a1171 100644
--- a/test/js/samples/dev-warning-missing-data-computed/expected-bundle.js
+++ b/test/js/samples/dev-warning-missing-data-computed/expected-bundle.js
@@ -160,7 +160,7 @@ var protoDev = {
 
 /* generated by Svelte vX.Y.Z */
 
-function bar(foo) {
+function bar({ foo }) {
 	return foo * 2;
 }
 
@@ -225,7 +225,7 @@ SvelteComponent.prototype._checkReadOnly = function _checkReadOnly(newState) {
 
 SvelteComponent.prototype._recompute = function _recompute(changed, state) {
 	if (changed.foo) {
-		if (this._differs(state.bar, (state.bar = bar(state.foo)))) changed.bar = true;
+		if (this._differs(state.bar, (state.bar = bar(state)))) changed.bar = true;
 	}
 };
 
diff --git a/test/js/samples/dev-warning-missing-data-computed/expected-v2.js b/test/js/samples/dev-warning-missing-data-computed/expected-v2.js
deleted file mode 100644
index 52dee37250..0000000000
--- a/test/js/samples/dev-warning-missing-data-computed/expected-v2.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, protoDev } from "svelte/shared.js";
-
-function bar({ foo }) {
-	return foo * 2;
-}
-
-function create_main_fragment(component, state) {
-	var p, text_value = state.Math.max(0, state.foo), text, text_1, text_2;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			text = createText(text_value);
-			text_1 = createText("\n\t");
-			text_2 = createText(state.bar);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-			appendNode(text, p);
-			appendNode(text_1, p);
-			appendNode(text_2, p);
-		},
-
-		p: function update(changed, state) {
-			if ((changed.Math || changed.foo) && text_value !== (text_value = state.Math.max(0, state.foo))) {
-				text.data = text_value;
-			}
-
-			if (changed.bar) {
-				text_2.data = state.bar;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	this._debugName = '<SvelteComponent>';
-	if (!options || (!options.target && !options.root)) throw new Error("'target' is a required option");
-	init(this, options);
-	this._state = assign({ Math : Math }, options.data);
-	this._recompute({ foo: 1 }, this._state);
-	if (!('foo' in this._state)) console.warn("<SvelteComponent> was created without expected data property 'foo'");
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		if (options.hydrate) throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, protoDev);
-
-SvelteComponent.prototype._checkReadOnly = function _checkReadOnly(newState) {
-	if ('bar' in newState && !this._updatingReadonlyProperty) throw new Error("<SvelteComponent>: Cannot set read-only property 'bar'");
-};
-
-SvelteComponent.prototype._recompute = function _recompute(changed, state) {
-	if (changed.foo) {
-		if (this._differs(state.bar, (state.bar = bar(state)))) changed.bar = true;
-	}
-}
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/dev-warning-missing-data-computed/expected.js b/test/js/samples/dev-warning-missing-data-computed/expected.js
index edf4331457..52dee37250 100644
--- a/test/js/samples/dev-warning-missing-data-computed/expected.js
+++ b/test/js/samples/dev-warning-missing-data-computed/expected.js
@@ -1,7 +1,7 @@
 /* generated by Svelte vX.Y.Z */
 import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, protoDev } from "svelte/shared.js";
 
-function bar(foo) {
+function bar({ foo }) {
 	return foo * 2;
 }
 
@@ -66,7 +66,7 @@ SvelteComponent.prototype._checkReadOnly = function _checkReadOnly(newState) {
 
 SvelteComponent.prototype._recompute = function _recompute(changed, state) {
 	if (changed.foo) {
-		if (this._differs(state.bar, (state.bar = bar(state.foo)))) changed.bar = true;
+		if (this._differs(state.bar, (state.bar = bar(state)))) changed.bar = true;
 	}
 }
 export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/dev-warning-missing-data-computed/input-v2.html b/test/js/samples/dev-warning-missing-data-computed/input-v2.html
deleted file mode 100644
index 06eb210493..0000000000
--- a/test/js/samples/dev-warning-missing-data-computed/input-v2.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<p>
-	{Math.max(0, foo)}
-	{bar}
-</p>
-
-<script>
-	export default {
-		computed: {
-			bar: ({ foo }) => foo * 2
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/js/samples/dev-warning-missing-data-computed/input.html b/test/js/samples/dev-warning-missing-data-computed/input.html
index f497b6e824..06eb210493 100644
--- a/test/js/samples/dev-warning-missing-data-computed/input.html
+++ b/test/js/samples/dev-warning-missing-data-computed/input.html
@@ -1,12 +1,12 @@
 <p>
-	{{Math.max(0, foo)}}
-	{{bar}}
+	{Math.max(0, foo)}
+	{bar}
 </p>
 
 <script>
 	export default {
 		computed: {
-			bar: foo => foo * 2
+			bar: ({ foo }) => foo * 2
 		}
 	};
 </script>
\ No newline at end of file
diff --git a/test/js/samples/do-use-dataset/_actual-bundle-v2.js b/test/js/samples/do-use-dataset/_actual-bundle-v2.js
deleted file mode 100644
index 32af7494c3..0000000000
--- a/test/js/samples/do-use-dataset/_actual-bundle-v2.js
+++ /dev/null
@@ -1,193 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div, text, div_1;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			text = createText("\n");
-			div_1 = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			div.dataset.foo = "bar";
-			div_1.dataset.foo = state.bar;
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			insertNode(text, target, anchor);
-			insertNode(div_1, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.bar) {
-				div_1.dataset.foo = state.bar;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-			detachNode(text);
-			detachNode(div_1);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/do-use-dataset/expected-bundle-v2.js b/test/js/samples/do-use-dataset/expected-bundle-v2.js
deleted file mode 100644
index 32af7494c3..0000000000
--- a/test/js/samples/do-use-dataset/expected-bundle-v2.js
+++ /dev/null
@@ -1,193 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div, text, div_1;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			text = createText("\n");
-			div_1 = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			div.dataset.foo = "bar";
-			div_1.dataset.foo = state.bar;
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			insertNode(text, target, anchor);
-			insertNode(div_1, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.bar) {
-				div_1.dataset.foo = state.bar;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-			detachNode(text);
-			detachNode(div_1);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/do-use-dataset/expected-v2.js b/test/js/samples/do-use-dataset/expected-v2.js
deleted file mode 100644
index b88636a606..0000000000
--- a/test/js/samples/do-use-dataset/expected-v2.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var div, text, div_1;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			text = createText("\n");
-			div_1 = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			div.dataset.foo = "bar";
-			div_1.dataset.foo = state.bar;
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			insertNode(text, target, anchor);
-			insertNode(div_1, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.bar) {
-				div_1.dataset.foo = state.bar;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-			detachNode(text);
-			detachNode(div_1);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/do-use-dataset/input-v2.html b/test/js/samples/do-use-dataset/input-v2.html
deleted file mode 100644
index fcd821731e..0000000000
--- a/test/js/samples/do-use-dataset/input-v2.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<div data-foo='bar'/>
-<div data-foo='{bar}'/>
diff --git a/test/js/samples/do-use-dataset/input.html b/test/js/samples/do-use-dataset/input.html
index acd9d623b4..fcd821731e 100644
--- a/test/js/samples/do-use-dataset/input.html
+++ b/test/js/samples/do-use-dataset/input.html
@@ -1,2 +1,2 @@
 <div data-foo='bar'/>
-<div data-foo='{{bar}}'/>
+<div data-foo='{bar}'/>
diff --git a/test/js/samples/dont-use-dataset-in-legacy/_actual-bundle-v2.js b/test/js/samples/dont-use-dataset-in-legacy/_actual-bundle-v2.js
deleted file mode 100644
index 5e9def1913..0000000000
--- a/test/js/samples/dont-use-dataset-in-legacy/_actual-bundle-v2.js
+++ /dev/null
@@ -1,197 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function setAttribute(node, attribute, value) {
-	node.setAttribute(attribute, value);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div, text, div_1;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			text = createText("\n");
-			div_1 = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setAttribute(div, "data-foo", "bar");
-			setAttribute(div_1, "data-foo", state.bar);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			insertNode(text, target, anchor);
-			insertNode(div_1, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.bar) {
-				setAttribute(div_1, "data-foo", state.bar);
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-			detachNode(text);
-			detachNode(div_1);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/dont-use-dataset-in-legacy/expected-bundle-v2.js b/test/js/samples/dont-use-dataset-in-legacy/expected-bundle-v2.js
deleted file mode 100644
index 5e9def1913..0000000000
--- a/test/js/samples/dont-use-dataset-in-legacy/expected-bundle-v2.js
+++ /dev/null
@@ -1,197 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function setAttribute(node, attribute, value) {
-	node.setAttribute(attribute, value);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div, text, div_1;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			text = createText("\n");
-			div_1 = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setAttribute(div, "data-foo", "bar");
-			setAttribute(div_1, "data-foo", state.bar);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			insertNode(text, target, anchor);
-			insertNode(div_1, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.bar) {
-				setAttribute(div_1, "data-foo", state.bar);
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-			detachNode(text);
-			detachNode(div_1);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/dont-use-dataset-in-legacy/expected-v2.js b/test/js/samples/dont-use-dataset-in-legacy/expected-v2.js
deleted file mode 100644
index 699da1270b..0000000000
--- a/test/js/samples/dont-use-dataset-in-legacy/expected-v2.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { assign, createElement, createText, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var div, text, div_1;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			text = createText("\n");
-			div_1 = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setAttribute(div, "data-foo", "bar");
-			setAttribute(div_1, "data-foo", state.bar);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			insertNode(text, target, anchor);
-			insertNode(div_1, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.bar) {
-				setAttribute(div_1, "data-foo", state.bar);
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-			detachNode(text);
-			detachNode(div_1);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-legacy/input-v2.html b/test/js/samples/dont-use-dataset-in-legacy/input-v2.html
deleted file mode 100644
index fcd821731e..0000000000
--- a/test/js/samples/dont-use-dataset-in-legacy/input-v2.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<div data-foo='bar'/>
-<div data-foo='{bar}'/>
diff --git a/test/js/samples/dont-use-dataset-in-legacy/input.html b/test/js/samples/dont-use-dataset-in-legacy/input.html
index acd9d623b4..fcd821731e 100644
--- a/test/js/samples/dont-use-dataset-in-legacy/input.html
+++ b/test/js/samples/dont-use-dataset-in-legacy/input.html
@@ -1,2 +1,2 @@
 <div data-foo='bar'/>
-<div data-foo='{{bar}}'/>
+<div data-foo='{bar}'/>
diff --git a/test/js/samples/dont-use-dataset-in-svg/_actual-bundle-v2.js b/test/js/samples/dont-use-dataset-in-svg/_actual-bundle-v2.js
deleted file mode 100644
index 54b8382a2d..0000000000
--- a/test/js/samples/dont-use-dataset-in-svg/_actual-bundle-v2.js
+++ /dev/null
@@ -1,195 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createSvgElement(name) {
-	return document.createElementNS('http://www.w3.org/2000/svg', name);
-}
-
-function setAttribute(node, attribute, value) {
-	node.setAttribute(attribute, value);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var svg, g, g_1;
-
-	return {
-		c: function create() {
-			svg = createSvgElement("svg");
-			g = createSvgElement("g");
-			g_1 = createSvgElement("g");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setAttribute(g, "data-foo", "bar");
-			setAttribute(g_1, "data-foo", state.bar);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(svg, target, anchor);
-			appendNode(g, svg);
-			appendNode(g_1, svg);
-		},
-
-		p: function update(changed, state) {
-			if (changed.bar) {
-				setAttribute(g_1, "data-foo", state.bar);
-			}
-		},
-
-		u: function unmount() {
-			detachNode(svg);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/dont-use-dataset-in-svg/expected-bundle-v2.js b/test/js/samples/dont-use-dataset-in-svg/expected-bundle-v2.js
deleted file mode 100644
index 54b8382a2d..0000000000
--- a/test/js/samples/dont-use-dataset-in-svg/expected-bundle-v2.js
+++ /dev/null
@@ -1,195 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createSvgElement(name) {
-	return document.createElementNS('http://www.w3.org/2000/svg', name);
-}
-
-function setAttribute(node, attribute, value) {
-	node.setAttribute(attribute, value);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var svg, g, g_1;
-
-	return {
-		c: function create() {
-			svg = createSvgElement("svg");
-			g = createSvgElement("g");
-			g_1 = createSvgElement("g");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setAttribute(g, "data-foo", "bar");
-			setAttribute(g_1, "data-foo", state.bar);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(svg, target, anchor);
-			appendNode(g, svg);
-			appendNode(g_1, svg);
-		},
-
-		p: function update(changed, state) {
-			if (changed.bar) {
-				setAttribute(g_1, "data-foo", state.bar);
-			}
-		},
-
-		u: function unmount() {
-			detachNode(svg);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/dont-use-dataset-in-svg/expected-v2.js b/test/js/samples/dont-use-dataset-in-svg/expected-v2.js
deleted file mode 100644
index 4269367254..0000000000
--- a/test/js/samples/dont-use-dataset-in-svg/expected-v2.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createSvgElement, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var svg, g, g_1;
-
-	return {
-		c: function create() {
-			svg = createSvgElement("svg");
-			g = createSvgElement("g");
-			g_1 = createSvgElement("g");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setAttribute(g, "data-foo", "bar");
-			setAttribute(g_1, "data-foo", state.bar);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(svg, target, anchor);
-			appendNode(g, svg);
-			appendNode(g_1, svg);
-		},
-
-		p: function update(changed, state) {
-			if (changed.bar) {
-				setAttribute(g_1, "data-foo", state.bar);
-			}
-		},
-
-		u: function unmount() {
-			detachNode(svg);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-svg/input-v2.html b/test/js/samples/dont-use-dataset-in-svg/input-v2.html
deleted file mode 100644
index 3032322b80..0000000000
--- a/test/js/samples/dont-use-dataset-in-svg/input-v2.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg>
-	<g data-foo='bar'/>
-	<g data-foo='{bar}'/>
-</svg>
diff --git a/test/js/samples/dont-use-dataset-in-svg/input.html b/test/js/samples/dont-use-dataset-in-svg/input.html
index c351e2dc18..3032322b80 100644
--- a/test/js/samples/dont-use-dataset-in-svg/input.html
+++ b/test/js/samples/dont-use-dataset-in-svg/input.html
@@ -1,4 +1,4 @@
 <svg>
 	<g data-foo='bar'/>
-	<g data-foo='{{bar}}'/>
+	<g data-foo='{bar}'/>
 </svg>
diff --git a/test/js/samples/each-block-changed-check/_actual-bundle-v2.js b/test/js/samples/each-block-changed-check/_actual-bundle-v2.js
deleted file mode 100644
index 89c3cab243..0000000000
--- a/test/js/samples/each-block-changed-check/_actual-bundle-v2.js
+++ /dev/null
@@ -1,323 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function detachAfter(before) {
-	while (before.nextSibling) {
-		before.parentNode.removeChild(before.nextSibling);
-	}
-}
-
-function destroyEach(iterations) {
-	for (var i = 0; i < iterations.length; i += 1) {
-		if (iterations[i]) iterations[i].d();
-	}
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var text, p, text_1;
-
-	var each_value = state.comments;
-
-	var each_blocks = [];
-
-	for (var i = 0; i < each_value.length; i += 1) {
-		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
-			each_value: each_value,
-			comment: each_value[i],
-			i: i
-		}));
-	}
-
-	return {
-		c: function create() {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].c();
-			}
-
-			text = createText("\n\n");
-			p = createElement("p");
-			text_1 = createText(state.foo);
-		},
-
-		m: function mount(target, anchor) {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
-			}
-
-			insertNode(text, target, anchor);
-			insertNode(p, target, anchor);
-			appendNode(text_1, p);
-		},
-
-		p: function update(changed, state) {
-			var each_value = state.comments;
-
-			if (changed.comments || changed.elapsed || changed.time) {
-				for (var i = 0; i < each_value.length; i += 1) {
-					var each_context = assign(assign({}, state), {
-						each_value: each_value,
-						comment: each_value[i],
-						i: i
-					});
-
-					if (each_blocks[i]) {
-						each_blocks[i].p(changed, each_context);
-					} else {
-						each_blocks[i] = create_each_block(component, each_context);
-						each_blocks[i].c();
-						each_blocks[i].m(text.parentNode, text);
-					}
-				}
-
-				for (; i < each_blocks.length; i += 1) {
-					each_blocks[i].u();
-					each_blocks[i].d();
-				}
-				each_blocks.length = each_value.length;
-			}
-
-			if (changed.foo) {
-				text_1.data = state.foo;
-			}
-		},
-
-		u: function unmount() {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].u();
-			}
-
-			detachNode(text);
-			detachNode(p);
-		},
-
-		d: function destroy$$1() {
-			destroyEach(each_blocks);
-		}
-	};
-}
-
-// (1:0) {#each comments as comment, i}
-function create_each_block(component, state) {
-	var comment = state.comment, each_value = state.each_value, i = state.i;
-	var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			strong = createElement("strong");
-			text = createText(i);
-			text_1 = createText("\n\n\t\t");
-			span = createElement("span");
-			text_2 = createText(text_2_value);
-			text_3 = createText(" wrote ");
-			text_4 = createText(text_4_value);
-			text_5 = createText(" ago:");
-			text_6 = createText("\n\n\t\t");
-			raw_before = createElement('noscript');
-			this.h();
-		},
-
-		h: function hydrate() {
-			span.className = "meta";
-			div.className = "comment";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			appendNode(strong, div);
-			appendNode(text, strong);
-			appendNode(text_1, div);
-			appendNode(span, div);
-			appendNode(text_2, span);
-			appendNode(text_3, span);
-			appendNode(text_4, span);
-			appendNode(text_5, span);
-			appendNode(text_6, div);
-			appendNode(raw_before, div);
-			raw_before.insertAdjacentHTML("afterend", raw_value);
-		},
-
-		p: function update(changed, state) {
-			comment = state.comment;
-			each_value = state.each_value;
-			i = state.i;
-			if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) {
-				text_2.data = text_2_value;
-			}
-
-			if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) {
-				text_4.data = text_4_value;
-			}
-
-			if ((changed.comments) && raw_value !== (raw_value = comment.html)) {
-				detachAfter(raw_before);
-				raw_before.insertAdjacentHTML("afterend", raw_value);
-			}
-		},
-
-		u: function unmount() {
-			detachAfter(raw_before);
-
-			detachNode(div);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/each-block-changed-check/expected-bundle-v2.js b/test/js/samples/each-block-changed-check/expected-bundle-v2.js
deleted file mode 100644
index 89c3cab243..0000000000
--- a/test/js/samples/each-block-changed-check/expected-bundle-v2.js
+++ /dev/null
@@ -1,323 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function detachAfter(before) {
-	while (before.nextSibling) {
-		before.parentNode.removeChild(before.nextSibling);
-	}
-}
-
-function destroyEach(iterations) {
-	for (var i = 0; i < iterations.length; i += 1) {
-		if (iterations[i]) iterations[i].d();
-	}
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var text, p, text_1;
-
-	var each_value = state.comments;
-
-	var each_blocks = [];
-
-	for (var i = 0; i < each_value.length; i += 1) {
-		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
-			each_value: each_value,
-			comment: each_value[i],
-			i: i
-		}));
-	}
-
-	return {
-		c: function create() {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].c();
-			}
-
-			text = createText("\n\n");
-			p = createElement("p");
-			text_1 = createText(state.foo);
-		},
-
-		m: function mount(target, anchor) {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
-			}
-
-			insertNode(text, target, anchor);
-			insertNode(p, target, anchor);
-			appendNode(text_1, p);
-		},
-
-		p: function update(changed, state) {
-			var each_value = state.comments;
-
-			if (changed.comments || changed.elapsed || changed.time) {
-				for (var i = 0; i < each_value.length; i += 1) {
-					var each_context = assign(assign({}, state), {
-						each_value: each_value,
-						comment: each_value[i],
-						i: i
-					});
-
-					if (each_blocks[i]) {
-						each_blocks[i].p(changed, each_context);
-					} else {
-						each_blocks[i] = create_each_block(component, each_context);
-						each_blocks[i].c();
-						each_blocks[i].m(text.parentNode, text);
-					}
-				}
-
-				for (; i < each_blocks.length; i += 1) {
-					each_blocks[i].u();
-					each_blocks[i].d();
-				}
-				each_blocks.length = each_value.length;
-			}
-
-			if (changed.foo) {
-				text_1.data = state.foo;
-			}
-		},
-
-		u: function unmount() {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].u();
-			}
-
-			detachNode(text);
-			detachNode(p);
-		},
-
-		d: function destroy$$1() {
-			destroyEach(each_blocks);
-		}
-	};
-}
-
-// (1:0) {#each comments as comment, i}
-function create_each_block(component, state) {
-	var comment = state.comment, each_value = state.each_value, i = state.i;
-	var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			strong = createElement("strong");
-			text = createText(i);
-			text_1 = createText("\n\n\t\t");
-			span = createElement("span");
-			text_2 = createText(text_2_value);
-			text_3 = createText(" wrote ");
-			text_4 = createText(text_4_value);
-			text_5 = createText(" ago:");
-			text_6 = createText("\n\n\t\t");
-			raw_before = createElement('noscript');
-			this.h();
-		},
-
-		h: function hydrate() {
-			span.className = "meta";
-			div.className = "comment";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			appendNode(strong, div);
-			appendNode(text, strong);
-			appendNode(text_1, div);
-			appendNode(span, div);
-			appendNode(text_2, span);
-			appendNode(text_3, span);
-			appendNode(text_4, span);
-			appendNode(text_5, span);
-			appendNode(text_6, div);
-			appendNode(raw_before, div);
-			raw_before.insertAdjacentHTML("afterend", raw_value);
-		},
-
-		p: function update(changed, state) {
-			comment = state.comment;
-			each_value = state.each_value;
-			i = state.i;
-			if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) {
-				text_2.data = text_2_value;
-			}
-
-			if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) {
-				text_4.data = text_4_value;
-			}
-
-			if ((changed.comments) && raw_value !== (raw_value = comment.html)) {
-				detachAfter(raw_before);
-				raw_before.insertAdjacentHTML("afterend", raw_value);
-			}
-		},
-
-		u: function unmount() {
-			detachAfter(raw_before);
-
-			detachNode(div);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/each-block-changed-check/expected-bundle.js b/test/js/samples/each-block-changed-check/expected-bundle.js
index 846fea0ba7..89c3cab243 100644
--- a/test/js/samples/each-block-changed-check/expected-bundle.js
+++ b/test/js/samples/each-block-changed-check/expected-bundle.js
@@ -237,7 +237,7 @@ function create_main_fragment(component, state) {
 	};
 }
 
-// (1:0) {{#each comments as comment, i}}
+// (1:0) {#each comments as comment, i}
 function create_each_block(component, state) {
 	var comment = state.comment, each_value = state.each_value, i = state.i;
 	var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before;
diff --git a/test/js/samples/each-block-changed-check/expected-v2.js b/test/js/samples/each-block-changed-check/expected-v2.js
deleted file mode 100644
index e7e0ccca30..0000000000
--- a/test/js/samples/each-block-changed-check/expected-v2.js
+++ /dev/null
@@ -1,169 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createElement, createText, destroyEach, detachAfter, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var text, p, text_1;
-
-	var each_value = state.comments;
-
-	var each_blocks = [];
-
-	for (var i = 0; i < each_value.length; i += 1) {
-		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
-			each_value: each_value,
-			comment: each_value[i],
-			i: i
-		}));
-	}
-
-	return {
-		c: function create() {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].c();
-			}
-
-			text = createText("\n\n");
-			p = createElement("p");
-			text_1 = createText(state.foo);
-		},
-
-		m: function mount(target, anchor) {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
-			}
-
-			insertNode(text, target, anchor);
-			insertNode(p, target, anchor);
-			appendNode(text_1, p);
-		},
-
-		p: function update(changed, state) {
-			var each_value = state.comments;
-
-			if (changed.comments || changed.elapsed || changed.time) {
-				for (var i = 0; i < each_value.length; i += 1) {
-					var each_context = assign(assign({}, state), {
-						each_value: each_value,
-						comment: each_value[i],
-						i: i
-					});
-
-					if (each_blocks[i]) {
-						each_blocks[i].p(changed, each_context);
-					} else {
-						each_blocks[i] = create_each_block(component, each_context);
-						each_blocks[i].c();
-						each_blocks[i].m(text.parentNode, text);
-					}
-				}
-
-				for (; i < each_blocks.length; i += 1) {
-					each_blocks[i].u();
-					each_blocks[i].d();
-				}
-				each_blocks.length = each_value.length;
-			}
-
-			if (changed.foo) {
-				text_1.data = state.foo;
-			}
-		},
-
-		u: function unmount() {
-			for (var i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].u();
-			}
-
-			detachNode(text);
-			detachNode(p);
-		},
-
-		d: function destroy() {
-			destroyEach(each_blocks);
-		}
-	};
-}
-
-// (1:0) {#each comments as comment, i}
-function create_each_block(component, state) {
-	var comment = state.comment, each_value = state.each_value, i = state.i;
-	var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			strong = createElement("strong");
-			text = createText(i);
-			text_1 = createText("\n\n\t\t");
-			span = createElement("span");
-			text_2 = createText(text_2_value);
-			text_3 = createText(" wrote ");
-			text_4 = createText(text_4_value);
-			text_5 = createText(" ago:");
-			text_6 = createText("\n\n\t\t");
-			raw_before = createElement('noscript');
-			this.h();
-		},
-
-		h: function hydrate() {
-			span.className = "meta";
-			div.className = "comment";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			appendNode(strong, div);
-			appendNode(text, strong);
-			appendNode(text_1, div);
-			appendNode(span, div);
-			appendNode(text_2, span);
-			appendNode(text_3, span);
-			appendNode(text_4, span);
-			appendNode(text_5, span);
-			appendNode(text_6, div);
-			appendNode(raw_before, div);
-			raw_before.insertAdjacentHTML("afterend", raw_value);
-		},
-
-		p: function update(changed, state) {
-			comment = state.comment;
-			each_value = state.each_value;
-			i = state.i;
-			if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) {
-				text_2.data = text_2_value;
-			}
-
-			if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) {
-				text_4.data = text_4_value;
-			}
-
-			if ((changed.comments) && raw_value !== (raw_value = comment.html)) {
-				detachAfter(raw_before);
-				raw_before.insertAdjacentHTML("afterend", raw_value);
-			}
-		},
-
-		u: function unmount() {
-			detachAfter(raw_before);
-
-			detachNode(div);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js
index cefd0a1338..e7e0ccca30 100644
--- a/test/js/samples/each-block-changed-check/expected.js
+++ b/test/js/samples/each-block-changed-check/expected.js
@@ -84,7 +84,7 @@ function create_main_fragment(component, state) {
 	};
 }
 
-// (1:0) {{#each comments as comment, i}}
+// (1:0) {#each comments as comment, i}
 function create_each_block(component, state) {
 	var comment = state.comment, each_value = state.each_value, i = state.i;
 	var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before;
diff --git a/test/js/samples/each-block-changed-check/input-v2.html b/test/js/samples/each-block-changed-check/input-v2.html
deleted file mode 100644
index b5b5703857..0000000000
--- a/test/js/samples/each-block-changed-check/input-v2.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{#each comments as comment, i}
-	<div class='comment'>
-		<strong>{i}</strong>
-
-		<span class='meta'>
-			{comment.author} wrote {elapsed(comment.time, time)} ago:
-		</span>
-
-		{@html comment.html}
-	</div>
-{/each}
-
-<p>{foo}</p>
\ No newline at end of file
diff --git a/test/js/samples/each-block-changed-check/input.html b/test/js/samples/each-block-changed-check/input.html
index 5a80a1a6c1..b5b5703857 100644
--- a/test/js/samples/each-block-changed-check/input.html
+++ b/test/js/samples/each-block-changed-check/input.html
@@ -1,13 +1,13 @@
-{{#each comments as comment, i}}
+{#each comments as comment, i}
 	<div class='comment'>
-		<strong>{{i}}</strong>
+		<strong>{i}</strong>
 
 		<span class='meta'>
-			{{comment.author}} wrote {{elapsed(comment.time, time)}} ago:
+			{comment.author} wrote {elapsed(comment.time, time)} ago:
 		</span>
 
-		{{{comment.html}}}
+		{@html comment.html}
 	</div>
-{{/each}}
+{/each}
 
-<p>{{foo}}</p>
\ No newline at end of file
+<p>{foo}</p>
\ No newline at end of file
diff --git a/test/js/samples/head-no-whitespace/_actual-bundle-v2.js b/test/js/samples/head-no-whitespace/_actual-bundle-v2.js
deleted file mode 100644
index 7f88574b70..0000000000
--- a/test/js/samples/head-no-whitespace/_actual-bundle-v2.js
+++ /dev/null
@@ -1,184 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var meta, meta_1;
-
-	return {
-		c: function create() {
-			meta = createElement("meta");
-			meta_1 = createElement("meta");
-			this.h();
-		},
-
-		h: function hydrate() {
-			meta.name = "twitter:creator";
-			meta.content = "@sveltejs";
-			meta_1.name = "twitter:title";
-			meta_1.content = "Svelte";
-		},
-
-		m: function mount(target, anchor) {
-			appendNode(meta, document.head);
-			appendNode(meta_1, document.head);
-		},
-
-		p: noop,
-
-		u: function unmount() {
-			detachNode(meta);
-			detachNode(meta_1);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/head-no-whitespace/expected-bundle-v2.js b/test/js/samples/head-no-whitespace/expected-bundle-v2.js
deleted file mode 100644
index 7f88574b70..0000000000
--- a/test/js/samples/head-no-whitespace/expected-bundle-v2.js
+++ /dev/null
@@ -1,184 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var meta, meta_1;
-
-	return {
-		c: function create() {
-			meta = createElement("meta");
-			meta_1 = createElement("meta");
-			this.h();
-		},
-
-		h: function hydrate() {
-			meta.name = "twitter:creator";
-			meta.content = "@sveltejs";
-			meta_1.name = "twitter:title";
-			meta_1.content = "Svelte";
-		},
-
-		m: function mount(target, anchor) {
-			appendNode(meta, document.head);
-			appendNode(meta_1, document.head);
-		},
-
-		p: noop,
-
-		u: function unmount() {
-			detachNode(meta);
-			detachNode(meta_1);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/head-no-whitespace/expected-v2.js b/test/js/samples/head-no-whitespace/expected-v2.js
deleted file mode 100644
index 9818f42116..0000000000
--- a/test/js/samples/head-no-whitespace/expected-v2.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createElement, detachNode, init, noop, proto } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var meta, meta_1;
-
-	return {
-		c: function create() {
-			meta = createElement("meta");
-			meta_1 = createElement("meta");
-			this.h();
-		},
-
-		h: function hydrate() {
-			meta.name = "twitter:creator";
-			meta.content = "@sveltejs";
-			meta_1.name = "twitter:title";
-			meta_1.content = "Svelte";
-		},
-
-		m: function mount(target, anchor) {
-			appendNode(meta, document.head);
-			appendNode(meta_1, document.head);
-		},
-
-		p: noop,
-
-		u: function unmount() {
-			detachNode(meta);
-			detachNode(meta_1);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/head-no-whitespace/input-v2.html b/test/js/samples/head-no-whitespace/input-v2.html
deleted file mode 100644
index 000b643abe..0000000000
--- a/test/js/samples/head-no-whitespace/input-v2.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<svelte:head>
-	<meta name='twitter:creator' content='@sveltejs'>
-	<meta name='twitter:title' content='Svelte'>
-</svelte:head>
\ No newline at end of file
diff --git a/test/js/samples/head-no-whitespace/input.html b/test/js/samples/head-no-whitespace/input.html
index 37c387083d..000b643abe 100644
--- a/test/js/samples/head-no-whitespace/input.html
+++ b/test/js/samples/head-no-whitespace/input.html
@@ -1,4 +1,4 @@
-<:Head>
+<svelte:head>
 	<meta name='twitter:creator' content='@sveltejs'>
 	<meta name='twitter:title' content='Svelte'>
-</:Head>
\ No newline at end of file
+</svelte:head>
\ No newline at end of file
diff --git a/test/js/samples/if-block-no-update/_actual-bundle-v2.js b/test/js/samples/if-block-no-update/_actual-bundle-v2.js
deleted file mode 100644
index 1760a2ca60..0000000000
--- a/test/js/samples/if-block-no-update/_actual-bundle-v2.js
+++ /dev/null
@@ -1,242 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createComment() {
-	return document.createComment('');
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var if_block_anchor;
-
-	function select_block_type(state) {
-		if (state.foo) return create_if_block;
-		return create_if_block_1;
-	}
-
-	var current_block_type = select_block_type(state);
-	var if_block = current_block_type(component, state);
-
-	return {
-		c: function create() {
-			if_block.c();
-			if_block_anchor = createComment();
-		},
-
-		m: function mount(target, anchor) {
-			if_block.m(target, anchor);
-			insertNode(if_block_anchor, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (current_block_type !== (current_block_type = select_block_type(state))) {
-				if_block.u();
-				if_block.d();
-				if_block = current_block_type(component, state);
-				if_block.c();
-				if_block.m(if_block_anchor.parentNode, if_block_anchor);
-			}
-		},
-
-		u: function unmount() {
-			if_block.u();
-			detachNode(if_block_anchor);
-		},
-
-		d: function destroy$$1() {
-			if_block.d();
-		}
-	};
-}
-
-// (1:0) {#if foo}
-function create_if_block(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "foo!";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (3:0) {:else}
-function create_if_block_1(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "not foo!";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/if-block-no-update/expected-bundle-v2.js b/test/js/samples/if-block-no-update/expected-bundle-v2.js
deleted file mode 100644
index 1760a2ca60..0000000000
--- a/test/js/samples/if-block-no-update/expected-bundle-v2.js
+++ /dev/null
@@ -1,242 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createComment() {
-	return document.createComment('');
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var if_block_anchor;
-
-	function select_block_type(state) {
-		if (state.foo) return create_if_block;
-		return create_if_block_1;
-	}
-
-	var current_block_type = select_block_type(state);
-	var if_block = current_block_type(component, state);
-
-	return {
-		c: function create() {
-			if_block.c();
-			if_block_anchor = createComment();
-		},
-
-		m: function mount(target, anchor) {
-			if_block.m(target, anchor);
-			insertNode(if_block_anchor, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (current_block_type !== (current_block_type = select_block_type(state))) {
-				if_block.u();
-				if_block.d();
-				if_block = current_block_type(component, state);
-				if_block.c();
-				if_block.m(if_block_anchor.parentNode, if_block_anchor);
-			}
-		},
-
-		u: function unmount() {
-			if_block.u();
-			detachNode(if_block_anchor);
-		},
-
-		d: function destroy$$1() {
-			if_block.d();
-		}
-	};
-}
-
-// (1:0) {#if foo}
-function create_if_block(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "foo!";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (3:0) {:else}
-function create_if_block_1(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "not foo!";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/if-block-no-update/expected-bundle.js b/test/js/samples/if-block-no-update/expected-bundle.js
index 303bd84821..1760a2ca60 100644
--- a/test/js/samples/if-block-no-update/expected-bundle.js
+++ b/test/js/samples/if-block-no-update/expected-bundle.js
@@ -181,7 +181,7 @@ function create_main_fragment(component, state) {
 	};
 }
 
-// (1:0) {{#if foo}}
+// (1:0) {#if foo}
 function create_if_block(component, state) {
 	var p;
 
@@ -203,7 +203,7 @@ function create_if_block(component, state) {
 	};
 }
 
-// (3:0) {{else}}
+// (3:0) {:else}
 function create_if_block_1(component, state) {
 	var p;
 
diff --git a/test/js/samples/if-block-no-update/expected-v2.js b/test/js/samples/if-block-no-update/expected-v2.js
deleted file mode 100644
index c06ff6ee67..0000000000
--- a/test/js/samples/if-block-no-update/expected-v2.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { assign, createComment, createElement, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var if_block_anchor;
-
-	function select_block_type(state) {
-		if (state.foo) return create_if_block;
-		return create_if_block_1;
-	}
-
-	var current_block_type = select_block_type(state);
-	var if_block = current_block_type(component, state);
-
-	return {
-		c: function create() {
-			if_block.c();
-			if_block_anchor = createComment();
-		},
-
-		m: function mount(target, anchor) {
-			if_block.m(target, anchor);
-			insertNode(if_block_anchor, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (current_block_type !== (current_block_type = select_block_type(state))) {
-				if_block.u();
-				if_block.d();
-				if_block = current_block_type(component, state);
-				if_block.c();
-				if_block.m(if_block_anchor.parentNode, if_block_anchor);
-			}
-		},
-
-		u: function unmount() {
-			if_block.u();
-			detachNode(if_block_anchor);
-		},
-
-		d: function destroy() {
-			if_block.d();
-		}
-	};
-}
-
-// (1:0) {#if foo}
-function create_if_block(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "foo!";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (3:0) {:else}
-function create_if_block_1(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "not foo!";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/if-block-no-update/expected.js b/test/js/samples/if-block-no-update/expected.js
index af8b381ba4..c06ff6ee67 100644
--- a/test/js/samples/if-block-no-update/expected.js
+++ b/test/js/samples/if-block-no-update/expected.js
@@ -44,7 +44,7 @@ function create_main_fragment(component, state) {
 	};
 }
 
-// (1:0) {{#if foo}}
+// (1:0) {#if foo}
 function create_if_block(component, state) {
 	var p;
 
@@ -66,7 +66,7 @@ function create_if_block(component, state) {
 	};
 }
 
-// (3:0) {{else}}
+// (3:0) {:else}
 function create_if_block_1(component, state) {
 	var p;
 
diff --git a/test/js/samples/if-block-no-update/input-v2.html b/test/js/samples/if-block-no-update/input-v2.html
deleted file mode 100644
index 57de219159..0000000000
--- a/test/js/samples/if-block-no-update/input-v2.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{#if foo}
-	<p>foo!</p>
-{:else}
-	<p>not foo!</p>
-{/if}
\ No newline at end of file
diff --git a/test/js/samples/if-block-no-update/input.html b/test/js/samples/if-block-no-update/input.html
index c73bfc6242..57de219159 100644
--- a/test/js/samples/if-block-no-update/input.html
+++ b/test/js/samples/if-block-no-update/input.html
@@ -1,5 +1,5 @@
-{{#if foo}}
+{#if foo}
 	<p>foo!</p>
-{{else}}
+{:else}
 	<p>not foo!</p>
-{{/if}}
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/js/samples/if-block-simple/_actual-bundle-v2.js b/test/js/samples/if-block-simple/_actual-bundle-v2.js
deleted file mode 100644
index f71aafff94..0000000000
--- a/test/js/samples/if-block-simple/_actual-bundle-v2.js
+++ /dev/null
@@ -1,218 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createComment() {
-	return document.createComment('');
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var if_block_anchor;
-
-	var if_block = (state.foo) && create_if_block(component, state);
-
-	return {
-		c: function create() {
-			if (if_block) if_block.c();
-			if_block_anchor = createComment();
-		},
-
-		m: function mount(target, anchor) {
-			if (if_block) if_block.m(target, anchor);
-			insertNode(if_block_anchor, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (state.foo) {
-				if (!if_block) {
-					if_block = create_if_block(component, state);
-					if_block.c();
-					if_block.m(if_block_anchor.parentNode, if_block_anchor);
-				}
-			} else if (if_block) {
-				if_block.u();
-				if_block.d();
-				if_block = null;
-			}
-		},
-
-		u: function unmount() {
-			if (if_block) if_block.u();
-			detachNode(if_block_anchor);
-		},
-
-		d: function destroy$$1() {
-			if (if_block) if_block.d();
-		}
-	};
-}
-
-// (1:0) {#if foo}
-function create_if_block(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "foo!";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/if-block-simple/expected-bundle-v2.js b/test/js/samples/if-block-simple/expected-bundle-v2.js
deleted file mode 100644
index f71aafff94..0000000000
--- a/test/js/samples/if-block-simple/expected-bundle-v2.js
+++ /dev/null
@@ -1,218 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createComment() {
-	return document.createComment('');
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var if_block_anchor;
-
-	var if_block = (state.foo) && create_if_block(component, state);
-
-	return {
-		c: function create() {
-			if (if_block) if_block.c();
-			if_block_anchor = createComment();
-		},
-
-		m: function mount(target, anchor) {
-			if (if_block) if_block.m(target, anchor);
-			insertNode(if_block_anchor, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (state.foo) {
-				if (!if_block) {
-					if_block = create_if_block(component, state);
-					if_block.c();
-					if_block.m(if_block_anchor.parentNode, if_block_anchor);
-				}
-			} else if (if_block) {
-				if_block.u();
-				if_block.d();
-				if_block = null;
-			}
-		},
-
-		u: function unmount() {
-			if (if_block) if_block.u();
-			detachNode(if_block_anchor);
-		},
-
-		d: function destroy$$1() {
-			if (if_block) if_block.d();
-		}
-	};
-}
-
-// (1:0) {#if foo}
-function create_if_block(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "foo!";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/if-block-simple/expected-bundle.js b/test/js/samples/if-block-simple/expected-bundle.js
index 7fe3bd33d7..f71aafff94 100644
--- a/test/js/samples/if-block-simple/expected-bundle.js
+++ b/test/js/samples/if-block-simple/expected-bundle.js
@@ -179,7 +179,7 @@ function create_main_fragment(component, state) {
 	};
 }
 
-// (1:0) {{#if foo}}
+// (1:0) {#if foo}
 function create_if_block(component, state) {
 	var p;
 
diff --git a/test/js/samples/if-block-simple/expected-v2.js b/test/js/samples/if-block-simple/expected-v2.js
deleted file mode 100644
index b3447471d3..0000000000
--- a/test/js/samples/if-block-simple/expected-v2.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { assign, createComment, createElement, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var if_block_anchor;
-
-	var if_block = (state.foo) && create_if_block(component, state);
-
-	return {
-		c: function create() {
-			if (if_block) if_block.c();
-			if_block_anchor = createComment();
-		},
-
-		m: function mount(target, anchor) {
-			if (if_block) if_block.m(target, anchor);
-			insertNode(if_block_anchor, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (state.foo) {
-				if (!if_block) {
-					if_block = create_if_block(component, state);
-					if_block.c();
-					if_block.m(if_block_anchor.parentNode, if_block_anchor);
-				}
-			} else if (if_block) {
-				if_block.u();
-				if_block.d();
-				if_block = null;
-			}
-		},
-
-		u: function unmount() {
-			if (if_block) if_block.u();
-			detachNode(if_block_anchor);
-		},
-
-		d: function destroy() {
-			if (if_block) if_block.d();
-		}
-	};
-}
-
-// (1:0) {#if foo}
-function create_if_block(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "foo!";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/if-block-simple/expected.js b/test/js/samples/if-block-simple/expected.js
index 11d3ccbdc6..b3447471d3 100644
--- a/test/js/samples/if-block-simple/expected.js
+++ b/test/js/samples/if-block-simple/expected.js
@@ -42,7 +42,7 @@ function create_main_fragment(component, state) {
 	};
 }
 
-// (1:0) {{#if foo}}
+// (1:0) {#if foo}
 function create_if_block(component, state) {
 	var p;
 
diff --git a/test/js/samples/if-block-simple/input-v2.html b/test/js/samples/if-block-simple/input-v2.html
deleted file mode 100644
index e36517e10c..0000000000
--- a/test/js/samples/if-block-simple/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{#if foo}
-	<p>foo!</p>
-{/if}
\ No newline at end of file
diff --git a/test/js/samples/if-block-simple/input.html b/test/js/samples/if-block-simple/input.html
index 050095b913..e36517e10c 100644
--- a/test/js/samples/if-block-simple/input.html
+++ b/test/js/samples/if-block-simple/input.html
@@ -1,3 +1,3 @@
-{{#if foo}}
+{#if foo}
 	<p>foo!</p>
-{{/if}}
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-multiple/_actual-bundle-v2.js b/test/js/samples/inline-style-optimized-multiple/_actual-bundle-v2.js
deleted file mode 100644
index bd3bacfac2..0000000000
--- a/test/js/samples/inline-style-optimized-multiple/_actual-bundle-v2.js
+++ /dev/null
@@ -1,191 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function setStyle(node, key, value) {
-	node.style.setProperty(key, value);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setStyle(div, "color", state.color);
-			setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)");
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.color) {
-				setStyle(div, "color", state.color);
-			}
-
-			if (changed.x || changed.y) {
-				setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)");
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized-multiple/expected-bundle-v2.js b/test/js/samples/inline-style-optimized-multiple/expected-bundle-v2.js
deleted file mode 100644
index bd3bacfac2..0000000000
--- a/test/js/samples/inline-style-optimized-multiple/expected-bundle-v2.js
+++ /dev/null
@@ -1,191 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function setStyle(node, key, value) {
-	node.style.setProperty(key, value);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setStyle(div, "color", state.color);
-			setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)");
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.color) {
-				setStyle(div, "color", state.color);
-			}
-
-			if (changed.x || changed.y) {
-				setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)");
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized-multiple/expected-v2.js b/test/js/samples/inline-style-optimized-multiple/expected-v2.js
deleted file mode 100644
index 7a94993b69..0000000000
--- a/test/js/samples/inline-style-optimized-multiple/expected-v2.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var div;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setStyle(div, "color", state.color);
-			setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)");
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.color) {
-				setStyle(div, "color", state.color);
-			}
-
-			if (changed.x || changed.y) {
-				setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)");
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-multiple/input-v2.html b/test/js/samples/inline-style-optimized-multiple/input-v2.html
deleted file mode 100644
index d9448e0ab0..0000000000
--- a/test/js/samples/inline-style-optimized-multiple/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style='color: {color}; transform: translate({x}px,{y}px);'></div>
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-multiple/input.html b/test/js/samples/inline-style-optimized-multiple/input.html
index 92d9cb805d..d9448e0ab0 100644
--- a/test/js/samples/inline-style-optimized-multiple/input.html
+++ b/test/js/samples/inline-style-optimized-multiple/input.html
@@ -1 +1 @@
-<div style='color: {{color}}; transform: translate({{x}}px,{{y}}px);'></div>
\ No newline at end of file
+<div style='color: {color}; transform: translate({x}px,{y}px);'></div>
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-url/_actual-bundle-v2.js b/test/js/samples/inline-style-optimized-url/_actual-bundle-v2.js
deleted file mode 100644
index 4119905682..0000000000
--- a/test/js/samples/inline-style-optimized-url/_actual-bundle-v2.js
+++ /dev/null
@@ -1,186 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function setStyle(node, key, value) {
-	node.style.setProperty(key, value);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setStyle(div, "background", "url(data:image/png;base64," + state.data + ")");
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.data) {
-				setStyle(div, "background", "url(data:image/png;base64," + state.data + ")");
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized-url/expected-bundle-v2.js b/test/js/samples/inline-style-optimized-url/expected-bundle-v2.js
deleted file mode 100644
index 4119905682..0000000000
--- a/test/js/samples/inline-style-optimized-url/expected-bundle-v2.js
+++ /dev/null
@@ -1,186 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function setStyle(node, key, value) {
-	node.style.setProperty(key, value);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setStyle(div, "background", "url(data:image/png;base64," + state.data + ")");
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.data) {
-				setStyle(div, "background", "url(data:image/png;base64," + state.data + ")");
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized-url/expected-v2.js b/test/js/samples/inline-style-optimized-url/expected-v2.js
deleted file mode 100644
index 5a27ecfa49..0000000000
--- a/test/js/samples/inline-style-optimized-url/expected-v2.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var div;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setStyle(div, "background", "url(data:image/png;base64," + state.data + ")");
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.data) {
-				setStyle(div, "background", "url(data:image/png;base64," + state.data + ")");
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-url/input-v2.html b/test/js/samples/inline-style-optimized-url/input-v2.html
deleted file mode 100644
index 677da52c30..0000000000
--- a/test/js/samples/inline-style-optimized-url/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style='background: url(data:image/png;base64,{data})'></div>
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-url/input.html b/test/js/samples/inline-style-optimized-url/input.html
index 7e3b2928eb..677da52c30 100644
--- a/test/js/samples/inline-style-optimized-url/input.html
+++ b/test/js/samples/inline-style-optimized-url/input.html
@@ -1 +1 @@
-<div style='background: url(data:image/png;base64,{{data}})'></div>
\ No newline at end of file
+<div style='background: url(data:image/png;base64,{data})'></div>
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized/_actual-bundle-v2.js b/test/js/samples/inline-style-optimized/_actual-bundle-v2.js
deleted file mode 100644
index 7643ee066d..0000000000
--- a/test/js/samples/inline-style-optimized/_actual-bundle-v2.js
+++ /dev/null
@@ -1,186 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function setStyle(node, key, value) {
-	node.style.setProperty(key, value);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setStyle(div, "color", state.color);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.color) {
-				setStyle(div, "color", state.color);
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized/expected-bundle-v2.js b/test/js/samples/inline-style-optimized/expected-bundle-v2.js
deleted file mode 100644
index 7643ee066d..0000000000
--- a/test/js/samples/inline-style-optimized/expected-bundle-v2.js
+++ /dev/null
@@ -1,186 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function setStyle(node, key, value) {
-	node.style.setProperty(key, value);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setStyle(div, "color", state.color);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.color) {
-				setStyle(div, "color", state.color);
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized/expected-v2.js b/test/js/samples/inline-style-optimized/expected-v2.js
deleted file mode 100644
index 86dabe8d21..0000000000
--- a/test/js/samples/inline-style-optimized/expected-v2.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var div;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			setStyle(div, "color", state.color);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.color) {
-				setStyle(div, "color", state.color);
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized/input-v2.html b/test/js/samples/inline-style-optimized/input-v2.html
deleted file mode 100644
index 004fd595c9..0000000000
--- a/test/js/samples/inline-style-optimized/input-v2.html
+++ /dev/null
@@ -1 +0,0 @@
-<div style='color: {color}'></div>
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized/input.html b/test/js/samples/inline-style-optimized/input.html
index ff7d95fb6e..004fd595c9 100644
--- a/test/js/samples/inline-style-optimized/input.html
+++ b/test/js/samples/inline-style-optimized/input.html
@@ -1 +1 @@
-<div style='color: {{color}}'></div>
\ No newline at end of file
+<div style='color: {color}'></div>
\ No newline at end of file
diff --git a/test/js/samples/inline-style-unoptimized/_actual-bundle-v2.js b/test/js/samples/inline-style-unoptimized/_actual-bundle-v2.js
deleted file mode 100644
index 67b2734743..0000000000
--- a/test/js/samples/inline-style-unoptimized/_actual-bundle-v2.js
+++ /dev/null
@@ -1,197 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div, text, div_1, div_1_style_value;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			text = createText("\n");
-			div_1 = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			div.style.cssText = state.style;
-			div_1.style.cssText = div_1_style_value = "" + state.key + ": " + state.value;
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			insertNode(text, target, anchor);
-			insertNode(div_1, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.style) {
-				div.style.cssText = state.style;
-			}
-
-			if ((changed.key || changed.value) && div_1_style_value !== (div_1_style_value = "" + state.key + ": " + state.value)) {
-				div_1.style.cssText = div_1_style_value;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-			detachNode(text);
-			detachNode(div_1);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/inline-style-unoptimized/expected-bundle-v2.js b/test/js/samples/inline-style-unoptimized/expected-bundle-v2.js
deleted file mode 100644
index 67b2734743..0000000000
--- a/test/js/samples/inline-style-unoptimized/expected-bundle-v2.js
+++ /dev/null
@@ -1,197 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div, text, div_1, div_1_style_value;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			text = createText("\n");
-			div_1 = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			div.style.cssText = state.style;
-			div_1.style.cssText = div_1_style_value = "" + state.key + ": " + state.value;
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			insertNode(text, target, anchor);
-			insertNode(div_1, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.style) {
-				div.style.cssText = state.style;
-			}
-
-			if ((changed.key || changed.value) && div_1_style_value !== (div_1_style_value = "" + state.key + ": " + state.value)) {
-				div_1.style.cssText = div_1_style_value;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-			detachNode(text);
-			detachNode(div_1);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/inline-style-unoptimized/expected-v2.js b/test/js/samples/inline-style-unoptimized/expected-v2.js
deleted file mode 100644
index 7d7e933c12..0000000000
--- a/test/js/samples/inline-style-unoptimized/expected-v2.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var div, text, div_1, div_1_style_value;
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			text = createText("\n");
-			div_1 = createElement("div");
-			this.h();
-		},
-
-		h: function hydrate() {
-			div.style.cssText = state.style;
-			div_1.style.cssText = div_1_style_value = "" + state.key + ": " + state.value;
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			insertNode(text, target, anchor);
-			insertNode(div_1, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (changed.style) {
-				div.style.cssText = state.style;
-			}
-
-			if ((changed.key || changed.value) && div_1_style_value !== (div_1_style_value = "" + state.key + ": " + state.value)) {
-				div_1.style.cssText = div_1_style_value;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-			detachNode(text);
-			detachNode(div_1);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-unoptimized/input-v2.html b/test/js/samples/inline-style-unoptimized/input-v2.html
deleted file mode 100644
index eac76d5b6e..0000000000
--- a/test/js/samples/inline-style-unoptimized/input-v2.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<div style='{style}'></div>
-<div style='{key}: {value}'></div>
\ No newline at end of file
diff --git a/test/js/samples/inline-style-unoptimized/input.html b/test/js/samples/inline-style-unoptimized/input.html
index 87e4592bfd..eac76d5b6e 100644
--- a/test/js/samples/inline-style-unoptimized/input.html
+++ b/test/js/samples/inline-style-unoptimized/input.html
@@ -1,2 +1,2 @@
-<div style='{{style}}'></div>
-<div style='{{key}}: {{value}}'></div>
\ No newline at end of file
+<div style='{style}'></div>
+<div style='{key}: {value}'></div>
\ No newline at end of file
diff --git a/test/js/samples/title/_actual-bundle-v2.js b/test/js/samples/title/_actual-bundle-v2.js
deleted file mode 100644
index 27cae18b3d..0000000000
--- a/test/js/samples/title/_actual-bundle-v2.js
+++ /dev/null
@@ -1,161 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var title_value;
-
-	document.title = title_value = "a " + state.custom + " title";
-
-	return {
-		c: noop,
-
-		m: noop,
-
-		p: function update(changed, state) {
-			if ((changed.custom) && title_value !== (title_value = "a " + state.custom + " title")) {
-				document.title = title_value;
-			}
-		},
-
-		u: noop,
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/title/expected-bundle-v2.js b/test/js/samples/title/expected-bundle-v2.js
deleted file mode 100644
index 27cae18b3d..0000000000
--- a/test/js/samples/title/expected-bundle-v2.js
+++ /dev/null
@@ -1,161 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var title_value;
-
-	document.title = title_value = "a " + state.custom + " title";
-
-	return {
-		c: noop,
-
-		m: noop,
-
-		p: function update(changed, state) {
-			if ((changed.custom) && title_value !== (title_value = "a " + state.custom + " title")) {
-				document.title = title_value;
-			}
-		},
-
-		u: noop,
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/title/expected-v2.js b/test/js/samples/title/expected-v2.js
deleted file mode 100644
index 0e059bbb4c..0000000000
--- a/test/js/samples/title/expected-v2.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { assign, init, noop, proto } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var title_value;
-
-	document.title = title_value = "a " + state.custom + " title";
-
-	return {
-		c: noop,
-
-		m: noop,
-
-		p: function update(changed, state) {
-			if ((changed.custom) && title_value !== (title_value = "a " + state.custom + " title")) {
-				document.title = title_value;
-			}
-		},
-
-		u: noop,
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/title/input-v2.html b/test/js/samples/title/input-v2.html
deleted file mode 100644
index 0eb2a9519d..0000000000
--- a/test/js/samples/title/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<svelte:head>
-	<title>a {custom} title</title>
-</svelte:head>
\ No newline at end of file
diff --git a/test/js/samples/title/input.html b/test/js/samples/title/input.html
index b006a8f50f..0eb2a9519d 100644
--- a/test/js/samples/title/input.html
+++ b/test/js/samples/title/input.html
@@ -1,3 +1,3 @@
-<:Head>
-	<title>a {{custom}} title</title>
-</:Head>
\ No newline at end of file
+<svelte:head>
+	<title>a {custom} title</title>
+</svelte:head>
\ No newline at end of file
diff --git a/test/js/samples/use-elements-as-anchors/_actual-bundle-v2.js b/test/js/samples/use-elements-as-anchors/_actual-bundle-v2.js
deleted file mode 100644
index 1fda063de1..0000000000
--- a/test/js/samples/use-elements-as-anchors/_actual-bundle-v2.js
+++ /dev/null
@@ -1,408 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function createComment() {
-	return document.createComment('');
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div, text, p, text_2, text_3, text_4, p_1, text_6, text_8, if_block_4_anchor;
-
-	var if_block = (state.a) && create_if_block(component, state);
-
-	var if_block_1 = (state.b) && create_if_block_1(component, state);
-
-	var if_block_2 = (state.c) && create_if_block_2(component, state);
-
-	var if_block_3 = (state.d) && create_if_block_3(component, state);
-
-	var if_block_4 = (state.e) && create_if_block_4(component, state);
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			if (if_block) if_block.c();
-			text = createText("\n\n\t");
-			p = createElement("p");
-			p.textContent = "this can be used as an anchor";
-			text_2 = createText("\n\n\t");
-			if (if_block_1) if_block_1.c();
-			text_3 = createText("\n\n\t");
-			if (if_block_2) if_block_2.c();
-			text_4 = createText("\n\n\t");
-			p_1 = createElement("p");
-			p_1.textContent = "so can this";
-			text_6 = createText("\n\n\t");
-			if (if_block_3) if_block_3.c();
-			text_8 = createText("\n\n");
-			if (if_block_4) if_block_4.c();
-			if_block_4_anchor = createComment();
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			if (if_block) if_block.m(div, null);
-			appendNode(text, div);
-			appendNode(p, div);
-			appendNode(text_2, div);
-			if (if_block_1) if_block_1.m(div, null);
-			appendNode(text_3, div);
-			if (if_block_2) if_block_2.m(div, null);
-			appendNode(text_4, div);
-			appendNode(p_1, div);
-			appendNode(text_6, div);
-			if (if_block_3) if_block_3.m(div, null);
-			insertNode(text_8, target, anchor);
-			if (if_block_4) if_block_4.m(target, anchor);
-			insertNode(if_block_4_anchor, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (state.a) {
-				if (!if_block) {
-					if_block = create_if_block(component, state);
-					if_block.c();
-					if_block.m(div, text);
-				}
-			} else if (if_block) {
-				if_block.u();
-				if_block.d();
-				if_block = null;
-			}
-
-			if (state.b) {
-				if (!if_block_1) {
-					if_block_1 = create_if_block_1(component, state);
-					if_block_1.c();
-					if_block_1.m(div, text_3);
-				}
-			} else if (if_block_1) {
-				if_block_1.u();
-				if_block_1.d();
-				if_block_1 = null;
-			}
-
-			if (state.c) {
-				if (!if_block_2) {
-					if_block_2 = create_if_block_2(component, state);
-					if_block_2.c();
-					if_block_2.m(div, text_4);
-				}
-			} else if (if_block_2) {
-				if_block_2.u();
-				if_block_2.d();
-				if_block_2 = null;
-			}
-
-			if (state.d) {
-				if (!if_block_3) {
-					if_block_3 = create_if_block_3(component, state);
-					if_block_3.c();
-					if_block_3.m(div, null);
-				}
-			} else if (if_block_3) {
-				if_block_3.u();
-				if_block_3.d();
-				if_block_3 = null;
-			}
-
-			if (state.e) {
-				if (!if_block_4) {
-					if_block_4 = create_if_block_4(component, state);
-					if_block_4.c();
-					if_block_4.m(if_block_4_anchor.parentNode, if_block_4_anchor);
-				}
-			} else if (if_block_4) {
-				if_block_4.u();
-				if_block_4.d();
-				if_block_4 = null;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-			if (if_block) if_block.u();
-			if (if_block_1) if_block_1.u();
-			if (if_block_2) if_block_2.u();
-			if (if_block_3) if_block_3.u();
-			detachNode(text_8);
-			if (if_block_4) if_block_4.u();
-			detachNode(if_block_4_anchor);
-		},
-
-		d: function destroy$$1() {
-			if (if_block) if_block.d();
-			if (if_block_1) if_block_1.d();
-			if (if_block_2) if_block_2.d();
-			if (if_block_3) if_block_3.d();
-			if (if_block_4) if_block_4.d();
-		}
-	};
-}
-
-// (2:1) {#if a}
-function create_if_block(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "a";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (8:1) {#if b}
-function create_if_block_1(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "b";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (12:1) {#if c}
-function create_if_block_2(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "c";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (18:1) {#if d}
-function create_if_block_3(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "d";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (25:0) {#if e}
-function create_if_block_4(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "e";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/use-elements-as-anchors/expected-bundle-v2.js b/test/js/samples/use-elements-as-anchors/expected-bundle-v2.js
deleted file mode 100644
index 1fda063de1..0000000000
--- a/test/js/samples/use-elements-as-anchors/expected-bundle-v2.js
+++ /dev/null
@@ -1,408 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function createComment() {
-	return document.createComment('');
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var div, text, p, text_2, text_3, text_4, p_1, text_6, text_8, if_block_4_anchor;
-
-	var if_block = (state.a) && create_if_block(component, state);
-
-	var if_block_1 = (state.b) && create_if_block_1(component, state);
-
-	var if_block_2 = (state.c) && create_if_block_2(component, state);
-
-	var if_block_3 = (state.d) && create_if_block_3(component, state);
-
-	var if_block_4 = (state.e) && create_if_block_4(component, state);
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			if (if_block) if_block.c();
-			text = createText("\n\n\t");
-			p = createElement("p");
-			p.textContent = "this can be used as an anchor";
-			text_2 = createText("\n\n\t");
-			if (if_block_1) if_block_1.c();
-			text_3 = createText("\n\n\t");
-			if (if_block_2) if_block_2.c();
-			text_4 = createText("\n\n\t");
-			p_1 = createElement("p");
-			p_1.textContent = "so can this";
-			text_6 = createText("\n\n\t");
-			if (if_block_3) if_block_3.c();
-			text_8 = createText("\n\n");
-			if (if_block_4) if_block_4.c();
-			if_block_4_anchor = createComment();
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			if (if_block) if_block.m(div, null);
-			appendNode(text, div);
-			appendNode(p, div);
-			appendNode(text_2, div);
-			if (if_block_1) if_block_1.m(div, null);
-			appendNode(text_3, div);
-			if (if_block_2) if_block_2.m(div, null);
-			appendNode(text_4, div);
-			appendNode(p_1, div);
-			appendNode(text_6, div);
-			if (if_block_3) if_block_3.m(div, null);
-			insertNode(text_8, target, anchor);
-			if (if_block_4) if_block_4.m(target, anchor);
-			insertNode(if_block_4_anchor, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (state.a) {
-				if (!if_block) {
-					if_block = create_if_block(component, state);
-					if_block.c();
-					if_block.m(div, text);
-				}
-			} else if (if_block) {
-				if_block.u();
-				if_block.d();
-				if_block = null;
-			}
-
-			if (state.b) {
-				if (!if_block_1) {
-					if_block_1 = create_if_block_1(component, state);
-					if_block_1.c();
-					if_block_1.m(div, text_3);
-				}
-			} else if (if_block_1) {
-				if_block_1.u();
-				if_block_1.d();
-				if_block_1 = null;
-			}
-
-			if (state.c) {
-				if (!if_block_2) {
-					if_block_2 = create_if_block_2(component, state);
-					if_block_2.c();
-					if_block_2.m(div, text_4);
-				}
-			} else if (if_block_2) {
-				if_block_2.u();
-				if_block_2.d();
-				if_block_2 = null;
-			}
-
-			if (state.d) {
-				if (!if_block_3) {
-					if_block_3 = create_if_block_3(component, state);
-					if_block_3.c();
-					if_block_3.m(div, null);
-				}
-			} else if (if_block_3) {
-				if_block_3.u();
-				if_block_3.d();
-				if_block_3 = null;
-			}
-
-			if (state.e) {
-				if (!if_block_4) {
-					if_block_4 = create_if_block_4(component, state);
-					if_block_4.c();
-					if_block_4.m(if_block_4_anchor.parentNode, if_block_4_anchor);
-				}
-			} else if (if_block_4) {
-				if_block_4.u();
-				if_block_4.d();
-				if_block_4 = null;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-			if (if_block) if_block.u();
-			if (if_block_1) if_block_1.u();
-			if (if_block_2) if_block_2.u();
-			if (if_block_3) if_block_3.u();
-			detachNode(text_8);
-			if (if_block_4) if_block_4.u();
-			detachNode(if_block_4_anchor);
-		},
-
-		d: function destroy$$1() {
-			if (if_block) if_block.d();
-			if (if_block_1) if_block_1.d();
-			if (if_block_2) if_block_2.d();
-			if (if_block_3) if_block_3.d();
-			if (if_block_4) if_block_4.d();
-		}
-	};
-}
-
-// (2:1) {#if a}
-function create_if_block(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "a";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (8:1) {#if b}
-function create_if_block_1(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "b";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (12:1) {#if c}
-function create_if_block_2(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "c";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (18:1) {#if d}
-function create_if_block_3(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "d";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (25:0) {#if e}
-function create_if_block_4(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "e";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/use-elements-as-anchors/expected-bundle.js b/test/js/samples/use-elements-as-anchors/expected-bundle.js
index f0eea45d77..1fda063de1 100644
--- a/test/js/samples/use-elements-as-anchors/expected-bundle.js
+++ b/test/js/samples/use-elements-as-anchors/expected-bundle.js
@@ -281,7 +281,7 @@ function create_main_fragment(component, state) {
 	};
 }
 
-// (2:1) {{#if a}}
+// (2:1) {#if a}
 function create_if_block(component, state) {
 	var p;
 
@@ -303,7 +303,7 @@ function create_if_block(component, state) {
 	};
 }
 
-// (8:1) {{#if b}}
+// (8:1) {#if b}
 function create_if_block_1(component, state) {
 	var p;
 
@@ -325,7 +325,7 @@ function create_if_block_1(component, state) {
 	};
 }
 
-// (12:1) {{#if c}}
+// (12:1) {#if c}
 function create_if_block_2(component, state) {
 	var p;
 
@@ -347,7 +347,7 @@ function create_if_block_2(component, state) {
 	};
 }
 
-// (18:1) {{#if d}}
+// (18:1) {#if d}
 function create_if_block_3(component, state) {
 	var p;
 
@@ -369,7 +369,7 @@ function create_if_block_3(component, state) {
 	};
 }
 
-// (25:0) {{#if e}}
+// (25:0) {#if e}
 function create_if_block_4(component, state) {
 	var p;
 
diff --git a/test/js/samples/use-elements-as-anchors/expected-v2.js b/test/js/samples/use-elements-as-anchors/expected-v2.js
deleted file mode 100644
index d9cff08d3f..0000000000
--- a/test/js/samples/use-elements-as-anchors/expected-v2.js
+++ /dev/null
@@ -1,262 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createComment, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var div, text, p, text_2, text_3, text_4, p_1, text_6, text_8, if_block_4_anchor;
-
-	var if_block = (state.a) && create_if_block(component, state);
-
-	var if_block_1 = (state.b) && create_if_block_1(component, state);
-
-	var if_block_2 = (state.c) && create_if_block_2(component, state);
-
-	var if_block_3 = (state.d) && create_if_block_3(component, state);
-
-	var if_block_4 = (state.e) && create_if_block_4(component, state);
-
-	return {
-		c: function create() {
-			div = createElement("div");
-			if (if_block) if_block.c();
-			text = createText("\n\n\t");
-			p = createElement("p");
-			p.textContent = "this can be used as an anchor";
-			text_2 = createText("\n\n\t");
-			if (if_block_1) if_block_1.c();
-			text_3 = createText("\n\n\t");
-			if (if_block_2) if_block_2.c();
-			text_4 = createText("\n\n\t");
-			p_1 = createElement("p");
-			p_1.textContent = "so can this";
-			text_6 = createText("\n\n\t");
-			if (if_block_3) if_block_3.c();
-			text_8 = createText("\n\n");
-			if (if_block_4) if_block_4.c();
-			if_block_4_anchor = createComment();
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(div, target, anchor);
-			if (if_block) if_block.m(div, null);
-			appendNode(text, div);
-			appendNode(p, div);
-			appendNode(text_2, div);
-			if (if_block_1) if_block_1.m(div, null);
-			appendNode(text_3, div);
-			if (if_block_2) if_block_2.m(div, null);
-			appendNode(text_4, div);
-			appendNode(p_1, div);
-			appendNode(text_6, div);
-			if (if_block_3) if_block_3.m(div, null);
-			insertNode(text_8, target, anchor);
-			if (if_block_4) if_block_4.m(target, anchor);
-			insertNode(if_block_4_anchor, target, anchor);
-		},
-
-		p: function update(changed, state) {
-			if (state.a) {
-				if (!if_block) {
-					if_block = create_if_block(component, state);
-					if_block.c();
-					if_block.m(div, text);
-				}
-			} else if (if_block) {
-				if_block.u();
-				if_block.d();
-				if_block = null;
-			}
-
-			if (state.b) {
-				if (!if_block_1) {
-					if_block_1 = create_if_block_1(component, state);
-					if_block_1.c();
-					if_block_1.m(div, text_3);
-				}
-			} else if (if_block_1) {
-				if_block_1.u();
-				if_block_1.d();
-				if_block_1 = null;
-			}
-
-			if (state.c) {
-				if (!if_block_2) {
-					if_block_2 = create_if_block_2(component, state);
-					if_block_2.c();
-					if_block_2.m(div, text_4);
-				}
-			} else if (if_block_2) {
-				if_block_2.u();
-				if_block_2.d();
-				if_block_2 = null;
-			}
-
-			if (state.d) {
-				if (!if_block_3) {
-					if_block_3 = create_if_block_3(component, state);
-					if_block_3.c();
-					if_block_3.m(div, null);
-				}
-			} else if (if_block_3) {
-				if_block_3.u();
-				if_block_3.d();
-				if_block_3 = null;
-			}
-
-			if (state.e) {
-				if (!if_block_4) {
-					if_block_4 = create_if_block_4(component, state);
-					if_block_4.c();
-					if_block_4.m(if_block_4_anchor.parentNode, if_block_4_anchor);
-				}
-			} else if (if_block_4) {
-				if_block_4.u();
-				if_block_4.d();
-				if_block_4 = null;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(div);
-			if (if_block) if_block.u();
-			if (if_block_1) if_block_1.u();
-			if (if_block_2) if_block_2.u();
-			if (if_block_3) if_block_3.u();
-			detachNode(text_8);
-			if (if_block_4) if_block_4.u();
-			detachNode(if_block_4_anchor);
-		},
-
-		d: function destroy() {
-			if (if_block) if_block.d();
-			if (if_block_1) if_block_1.d();
-			if (if_block_2) if_block_2.d();
-			if (if_block_3) if_block_3.d();
-			if (if_block_4) if_block_4.d();
-		}
-	};
-}
-
-// (2:1) {#if a}
-function create_if_block(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "a";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (8:1) {#if b}
-function create_if_block_1(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "b";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (12:1) {#if c}
-function create_if_block_2(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "c";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (18:1) {#if d}
-function create_if_block_3(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "d";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-// (25:0) {#if e}
-function create_if_block_4(component, state) {
-	var p;
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			p.textContent = "e";
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: noop
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/use-elements-as-anchors/expected.js b/test/js/samples/use-elements-as-anchors/expected.js
index 5f6f27c742..d9cff08d3f 100644
--- a/test/js/samples/use-elements-as-anchors/expected.js
+++ b/test/js/samples/use-elements-as-anchors/expected.js
@@ -136,7 +136,7 @@ function create_main_fragment(component, state) {
 	};
 }
 
-// (2:1) {{#if a}}
+// (2:1) {#if a}
 function create_if_block(component, state) {
 	var p;
 
@@ -158,7 +158,7 @@ function create_if_block(component, state) {
 	};
 }
 
-// (8:1) {{#if b}}
+// (8:1) {#if b}
 function create_if_block_1(component, state) {
 	var p;
 
@@ -180,7 +180,7 @@ function create_if_block_1(component, state) {
 	};
 }
 
-// (12:1) {{#if c}}
+// (12:1) {#if c}
 function create_if_block_2(component, state) {
 	var p;
 
@@ -202,7 +202,7 @@ function create_if_block_2(component, state) {
 	};
 }
 
-// (18:1) {{#if d}}
+// (18:1) {#if d}
 function create_if_block_3(component, state) {
 	var p;
 
@@ -224,7 +224,7 @@ function create_if_block_3(component, state) {
 	};
 }
 
-// (25:0) {{#if e}}
+// (25:0) {#if e}
 function create_if_block_4(component, state) {
 	var p;
 
diff --git a/test/js/samples/use-elements-as-anchors/input-v2.html b/test/js/samples/use-elements-as-anchors/input-v2.html
deleted file mode 100644
index 9c18d40f58..0000000000
--- a/test/js/samples/use-elements-as-anchors/input-v2.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div>
-	{#if a}
-		<p>a</p>
-	{/if}
-
-	<p>this can be used as an anchor</p>
-
-	{#if b}
-		<p>b</p>
-	{/if}
-
-	{#if c}
-		<p>c</p>
-	{/if}
-
-	<p>so can this</p>
-
-	{#if d}
-		<p>d</p>
-	{/if}
-
-	<!-- d can use 'null' as its anchor -->
-</div>
-
-{#if e}
-	<p>e</p>
-{/if}
\ No newline at end of file
diff --git a/test/js/samples/use-elements-as-anchors/input.html b/test/js/samples/use-elements-as-anchors/input.html
index c55e7bd4de..9c18d40f58 100644
--- a/test/js/samples/use-elements-as-anchors/input.html
+++ b/test/js/samples/use-elements-as-anchors/input.html
@@ -1,27 +1,27 @@
 <div>
-	{{#if a}}
+	{#if a}
 		<p>a</p>
-	{{/if}}
+	{/if}
 
 	<p>this can be used as an anchor</p>
 
-	{{#if b}}
+	{#if b}
 		<p>b</p>
-	{{/if}}
+	{/if}
 
-	{{#if c}}
+	{#if c}
 		<p>c</p>
-	{{/if}}
+	{/if}
 
 	<p>so can this</p>
 
-	{{#if d}}
+	{#if d}
 		<p>d</p>
-	{{/if}}
+	{/if}
 
 	<!-- d can use 'null' as its anchor -->
 </div>
 
-{{#if e}}
+{#if e}
 	<p>e</p>
-{{/if}}
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/js/samples/window-binding-scroll/_actual-bundle-v2.js b/test/js/samples/window-binding-scroll/_actual-bundle-v2.js
deleted file mode 100644
index deb99a4bb8..0000000000
--- a/test/js/samples/window-binding-scroll/_actual-bundle-v2.js
+++ /dev/null
@@ -1,210 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var window_updating = false, clear_window_updating = function() { window_updating = false; }, window_updating_timeout, p, text, text_1;
-
-	function onwindowscroll(event) {
-		if (window_updating) return;
-		window_updating = true;
-
-		component.set({
-			y: this.pageYOffset
-		});
-		window_updating = false;
-	}
-	window.addEventListener("scroll", onwindowscroll);
-
-	component.observe("y", function(y) {
-		window_updating = true;
-		clearTimeout(window_updating_timeout);
-		window.scrollTo(window.pageXOffset, y);
-		window_updating_timeout = setTimeout(clear_window_updating, 100);
-	});
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			text = createText("scrolled to ");
-			text_1 = createText(state.y);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-			appendNode(text, p);
-			appendNode(text_1, p);
-		},
-
-		p: function update(changed, state) {
-			if (changed.y) {
-				text_1.data = state.y;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: function destroy$$1() {
-			window.removeEventListener("scroll", onwindowscroll);
-		}
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-	this._state.y = window.pageYOffset;
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/window-binding-scroll/expected-bundle-v2.js b/test/js/samples/window-binding-scroll/expected-bundle-v2.js
deleted file mode 100644
index deb99a4bb8..0000000000
--- a/test/js/samples/window-binding-scroll/expected-bundle-v2.js
+++ /dev/null
@@ -1,210 +0,0 @@
-function noop() {}
-
-function assign(tar, src) {
-	for (var k in src) tar[k] = src[k];
-	return tar;
-}
-
-function appendNode(node, target) {
-	target.appendChild(node);
-}
-
-function insertNode(node, target, anchor) {
-	target.insertBefore(node, anchor);
-}
-
-function detachNode(node) {
-	node.parentNode.removeChild(node);
-}
-
-function createElement(name) {
-	return document.createElement(name);
-}
-
-function createText(data) {
-	return document.createTextNode(data);
-}
-
-function blankObject() {
-	return Object.create(null);
-}
-
-function destroy(detach) {
-	this.destroy = noop;
-	this.fire('destroy');
-	this.set = this.get = noop;
-
-	if (detach !== false) this._fragment.u();
-	this._fragment.d();
-	this._fragment = this._state = null;
-}
-
-function _differs(a, b) {
-	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
-}
-
-function fire(eventName, data) {
-	var handlers =
-		eventName in this._handlers && this._handlers[eventName].slice();
-	if (!handlers) return;
-
-	for (var i = 0; i < handlers.length; i += 1) {
-		var handler = handlers[i];
-
-		if (!handler.__calling) {
-			handler.__calling = true;
-			handler.call(this, data);
-			handler.__calling = false;
-		}
-	}
-}
-
-function get() {
-	return this._state;
-}
-
-function init(component, options) {
-	component._handlers = blankObject();
-	component._bind = options._bind;
-
-	component.options = options;
-	component.root = options.root || component;
-	component.store = component.root.store || options.store;
-}
-
-function on(eventName, handler) {
-	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
-	handlers.push(handler);
-
-	return {
-		cancel: function() {
-			var index = handlers.indexOf(handler);
-			if (~index) handlers.splice(index, 1);
-		}
-	};
-}
-
-function set(newState) {
-	this._set(assign({}, newState));
-	if (this.root._lock) return;
-	this.root._lock = true;
-	callAll(this.root._beforecreate);
-	callAll(this.root._oncreate);
-	callAll(this.root._aftercreate);
-	this.root._lock = false;
-}
-
-function _set(newState) {
-	var oldState = this._state,
-		changed = {},
-		dirty = false;
-
-	for (var key in newState) {
-		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
-	}
-	if (!dirty) return;
-
-	this._state = assign(assign({}, oldState), newState);
-	this._recompute(changed, this._state);
-	if (this._bind) this._bind(changed, this._state);
-
-	if (this._fragment) {
-		this.fire("state", { changed: changed, current: this._state, previous: oldState });
-		this._fragment.p(changed, this._state);
-		this.fire("update", { changed: changed, current: this._state, previous: oldState });
-	}
-}
-
-function callAll(fns) {
-	while (fns && fns.length) fns.shift()();
-}
-
-function _mount(target, anchor) {
-	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
-}
-
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
-var proto = {
-	destroy,
-	get,
-	fire,
-	on,
-	set,
-	_recompute: noop,
-	_set,
-	_mount,
-	_unmount,
-	_differs
-};
-
-/* generated by Svelte vX.Y.Z */
-
-function create_main_fragment(component, state) {
-	var window_updating = false, clear_window_updating = function() { window_updating = false; }, window_updating_timeout, p, text, text_1;
-
-	function onwindowscroll(event) {
-		if (window_updating) return;
-		window_updating = true;
-
-		component.set({
-			y: this.pageYOffset
-		});
-		window_updating = false;
-	}
-	window.addEventListener("scroll", onwindowscroll);
-
-	component.observe("y", function(y) {
-		window_updating = true;
-		clearTimeout(window_updating_timeout);
-		window.scrollTo(window.pageXOffset, y);
-		window_updating_timeout = setTimeout(clear_window_updating, 100);
-	});
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			text = createText("scrolled to ");
-			text_1 = createText(state.y);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-			appendNode(text, p);
-			appendNode(text_1, p);
-		},
-
-		p: function update(changed, state) {
-			if (changed.y) {
-				text_1.data = state.y;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: function destroy$$1() {
-			window.removeEventListener("scroll", onwindowscroll);
-		}
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-	this._state.y = window.pageYOffset;
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-
-export default SvelteComponent;
diff --git a/test/js/samples/window-binding-scroll/expected-v2.js b/test/js/samples/window-binding-scroll/expected-v2.js
deleted file mode 100644
index 59009aeb9b..0000000000
--- a/test/js/samples/window-binding-scroll/expected-v2.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createElement, createText, detachNode, init, insertNode, proto } from "svelte/shared.js";
-
-function create_main_fragment(component, state) {
-	var window_updating = false, clear_window_updating = function() { window_updating = false; }, window_updating_timeout, p, text, text_1;
-
-	function onwindowscroll(event) {
-		if (window_updating) return;
-		window_updating = true;
-
-		component.set({
-			y: this.pageYOffset
-		});
-		window_updating = false;
-	}
-	window.addEventListener("scroll", onwindowscroll);
-
-	component.observe("y", function(y) {
-		window_updating = true;
-		clearTimeout(window_updating_timeout);
-		window.scrollTo(window.pageXOffset, y);
-		window_updating_timeout = setTimeout(clear_window_updating, 100);
-	});
-
-	return {
-		c: function create() {
-			p = createElement("p");
-			text = createText("scrolled to ");
-			text_1 = createText(state.y);
-		},
-
-		m: function mount(target, anchor) {
-			insertNode(p, target, anchor);
-			appendNode(text, p);
-			appendNode(text_1, p);
-		},
-
-		p: function update(changed, state) {
-			if (changed.y) {
-				text_1.data = state.y;
-			}
-		},
-
-		u: function unmount() {
-			detachNode(p);
-		},
-
-		d: function destroy() {
-			window.removeEventListener("scroll", onwindowscroll);
-		}
-	};
-}
-
-function SvelteComponent(options) {
-	init(this, options);
-	this._state = assign({}, options.data);
-	this._state.y = window.pageYOffset;
-
-	this._fragment = create_main_fragment(this, this._state);
-
-	if (options.target) {
-		this._fragment.c();
-		this._mount(options.target, options.anchor);
-	}
-}
-
-assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/window-binding-scroll/input-v2.html b/test/js/samples/window-binding-scroll/input-v2.html
deleted file mode 100644
index 74ace567ab..0000000000
--- a/test/js/samples/window-binding-scroll/input-v2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<:Window bind:scrollY=y/>
-
-<p>scrolled to {y}</p>
\ No newline at end of file
diff --git a/test/js/samples/window-binding-scroll/input.html b/test/js/samples/window-binding-scroll/input.html
index 2365bfcc96..74ace567ab 100644
--- a/test/js/samples/window-binding-scroll/input.html
+++ b/test/js/samples/window-binding-scroll/input.html
@@ -1,3 +1,3 @@
 <:Window bind:scrollY=y/>
 
-<p>scrolled to {{y}}</p>
\ No newline at end of file
+<p>scrolled to {y}</p>
\ No newline at end of file