diff --git a/src/compiler/compile/nodes/Binding.ts b/src/compiler/compile/nodes/Binding.ts
index 29992f940f..8fc983254b 100644
--- a/src/compiler/compile/nodes/Binding.ts
+++ b/src/compiler/compile/nodes/Binding.ts
@@ -4,6 +4,7 @@ import Expression from './shared/Expression';
 import Component from '../Component';
 import TemplateScope from './shared/TemplateScope';
 import {dimensions} from "../../utils/patterns";
+import { Node as ESTreeNode } from 'estree';
 import { x } from 'code-red';
 
 // TODO this should live in a specific binding
@@ -18,6 +19,7 @@ export default class Binding extends Node {
 	type: 'Binding';
 	name: string;
 	expression: Expression;
+	raw_expression: ESTreeNode; // TODO exists only for bind:this — is there a more elegant solution?
 	is_contextual: boolean;
 	obj: string;
 	prop: string;
@@ -35,6 +37,7 @@ export default class Binding extends Node {
 
 		this.name = info.name;
 		this.expression = new Expression(component, this, scope, info.expression);
+		this.raw_expression = JSON.parse(JSON.stringify(info.expression));
 
 		let obj;
 		let prop;
diff --git a/src/compiler/compile/render_dom/index.ts b/src/compiler/compile/render_dom/index.ts
index eeb4d3b2b4..9a3e955cad 100644
--- a/src/compiler/compile/render_dom/index.ts
+++ b/src/compiler/compile/render_dom/index.ts
@@ -416,7 +416,7 @@ export default function dom(
 
 				${inject_state && x`$$self.$inject_state = ${inject_state};`}
 
-				${injected.length && `let ${injected.join(', ')};`}
+				${injected.map(name => b`let ${name};`)}
 
 				${reactive_declarations.length > 0 && b`
 				$$self.$$.update = ($$dirty = ${reactive_dependencies}) => {
diff --git a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
index 1d5bc481ee..ee30d440a7 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
@@ -7,7 +7,7 @@ import Renderer from '../../Renderer';
 import flatten_reference from '../../../utils/flatten_reference';
 import EachBlock from '../../../nodes/EachBlock';
 import { changed } from '../shared/changed';
-import { Node, Identifier } from 'estree';
+import { Node, Identifier, MemberExpression } from 'estree';
 
 export default class BindingWrapper {
 	node: Binding;
@@ -51,12 +51,8 @@ export default class BindingWrapper {
 
 		this.object = get_object(this.node.expression.node).name;
 
-		// TODO unfortunate code is necessary because we need to use `ctx`
-		// inside the fragment, but not inside the <script>
-		const contextless_snippet = JSON.parse(JSON.stringify(this.node.expression.node));
-
 		// view to model
-		this.handler = get_event_handler(this, parent.renderer, block, this.object, contextless_snippet);
+		this.handler = get_event_handler(this, parent.renderer, block, this.object, this.node.raw_expression);
 
 		this.snippet = this.node.expression.manipulate(block);
 
@@ -243,59 +239,95 @@ function get_event_handler(
 	renderer: Renderer,
 	block: Block,
 	name: string,
-	snippet: Node
+	lhs: Node
 ): {
 	uses_context: boolean;
 	mutation: (Node | Node[]);
 	contextual_dependencies: Set<string>;
-	snippet?: Node;
+	lhs?: Node;
 } {
 	const value = get_value_from_dom(renderer, binding.parent, binding);
-	let store = binding.object[0] === '$' ? binding.object.slice(1) : null;
+	const contextual_dependencies = new Set(binding.node.expression.contextual_dependencies);
 
-	let tail = null;
-	if (binding.node.expression.node.type === 'MemberExpression') {
-		// const { start, end } = get_tail(binding.node.expression.node);
-		// tail = renderer.component.source.slice(start, end);
-		tail = binding.node.expression.node.object;
-	}
+	const context = block.bindings.get(name);
 
-	if (binding.node.is_contextual) {
-		const binding = block.bindings.get(name);
-		const { object, property, snippet } = binding;
+	if (context) {
+		const { object, property } = context;
 
-		if (binding.store) {
-			store = binding.store;
-			tail = x`${binding.tail}.${tail}`;
-		}
+		if (lhs.type === 'Identifier') {
+			lhs = x`${object}[${property}]`;
 
-		return {
-			uses_context: true,
-			mutation: store
-				? mutate_store(store, value, tail)
-				: b`${snippet} = ${value};`,
-			contextual_dependencies: new Set([object.name, property.name])
-		};
-	}
-
-	const mutation = store
-		? mutate_store(store, value, tail)
-		: b`${snippet} = ${value};`;
-
-	if (binding.node.expression.node.type === 'MemberExpression') {
-		return {
-			uses_context: binding.node.expression.uses_context,
-			mutation,
-			contextual_dependencies: binding.node.expression.contextual_dependencies,
-			snippet
-		};
+			contextual_dependencies.add(object.name);
+			contextual_dependencies.add(property.name);
+		} else {
+			// (lhs as MemberExpression).object = x`${object}[${property}]`;
+		}
 	}
 
 	return {
-		uses_context: false,
-		mutation,
-		contextual_dependencies: new Set()
+		uses_context: binding.node.is_contextual || binding.node.expression.uses_context, // TODO this is messy
+		mutation: b`${lhs} = ${value}`,
+		contextual_dependencies
 	};
+
+	// if (lhs.type === 'MemberExpression') {
+	// 	return {
+	// 		uses_context: binding.node.is_contextual || binding.node.expression.uses_context, // TODO this is messy
+	// 		mutation: b`${lhs} = ${value}`,
+	// 		contextual_dependencies
+	// 	};
+	// } else {
+
+	// }
+
+	// const binding_info = block.bindings.get(name);
+	// console.log(binding_info);
+
+	// let store = binding.object[0] === '$' ? binding.object.slice(1) : null;
+
+	// let tail = null;
+	// if (binding.node.expression.node.type === 'MemberExpression') {
+	// 	// const { start, end } = get_tail(binding.node.expression.node);
+	// 	// tail = renderer.component.source.slice(start, end);
+	// 	tail = binding.node.expression.node.object;
+	// }
+
+	// if (binding.node.is_contextual) {
+	// 	const binding = block.bindings.get(name);
+	// 	const { object, property, snippet } = binding;
+
+	// 	if (binding.store) {
+	// 		store = binding.store;
+	// 		tail = x`${binding.tail}.${tail}`;
+	// 	}
+
+	// 	return {
+	// 		uses_context: true,
+	// 		mutation: store
+	// 			? mutate_store(store, value, tail)
+	// 			: b`${snippet} = ${value};`,
+	// 		contextual_dependencies: new Set([object.name, property.name])
+	// 	};
+	// }
+
+	// const mutation = store
+	// 	? mutate_store(store, value, tail)
+	// 	: b`${snippet} = ${value};`;
+
+	// if (binding.node.expression.node.type === 'MemberExpression') {
+	// 	return {
+	// 		uses_context: binding.node.expression.uses_context,
+	// 		mutation,
+	// 		contextual_dependencies: binding.node.expression.contextual_dependencies,
+	// 		snippet
+	// 	};
+	// }
+
+	// return {
+	// 	uses_context: false,
+	// 	mutation,
+	// 	contextual_dependencies: new Set()
+	// };
 }
 
 function get_value_from_dom(
diff --git a/src/compiler/compile/render_dom/wrappers/IfBlock.ts b/src/compiler/compile/render_dom/wrappers/IfBlock.ts
index 34f679bce9..3e04d0005e 100644
--- a/src/compiler/compile/render_dom/wrappers/IfBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/IfBlock.ts
@@ -191,7 +191,7 @@ export default class IfBlockWrapper extends Wrapper {
 
 		const vars = { name, anchor, if_exists_condition, has_else, has_transitions };
 
-		const detaching = is_head(parent_node) ? null : 'detaching';
+		const detaching = parent_node && !is_head(parent_node) ? null : 'detaching';
 
 		if (this.node.else) {
 			this.branches.forEach(branch => {
diff --git a/src/compiler/compile/render_dom/wrappers/shared/bind_this.ts b/src/compiler/compile/render_dom/wrappers/shared/bind_this.ts
index 93525f1020..504e209763 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/bind_this.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/bind_this.ts
@@ -18,19 +18,19 @@ export default function bind_this(component: Component, block: Block, binding: B
 	let object;
 	let body;
 
-	if (binding.is_contextual && binding.expression.node.type === 'Identifier') {
+	if (binding.is_contextual && binding.raw_expression.type === 'Identifier') {
 		// bind:x={y} — we can't just do `y = x`, we need to
 		// to `array[index] = x;
-		const { name } = binding.expression.node;
+		const { name } = binding.raw_expression;
 		const { snippet } = block.bindings.get(name);
 		lhs = snippet;
 
 		body = b`${lhs} = $$value`; // TODO we need to invalidate... something
 	} else {
-		object = flatten_reference(binding.expression.node).name;
-		lhs = component.source.slice(binding.expression.node.start, binding.expression.node.end).trim();
+		object = flatten_reference(binding.raw_expression).name;
+		lhs = binding.raw_expression;
 
-		body = binding.expression.node.type === 'Identifier'
+		body = binding.raw_expression.type === 'Identifier'
 			? b`
 				${component.invalidate(object, x`${lhs} = $$value`)};
 			`
diff --git a/test/runtime/samples/_/_config.js b/test/runtime/samples/_/_config.js
index c16f9b94f4..ab18bd05d4 100644
--- a/test/runtime/samples/_/_config.js
+++ b/test/runtime/samples/_/_config.js
@@ -1,3 +1,20 @@
 export default {
-	html: '<p>1 + 2 = 3</p>'
-};
\ No newline at end of file
+	html: `<div>foo</div><div>bar</div><div>baz</div>`,
+
+	test({ assert, component, target }) {
+		let elems = target.querySelectorAll('div');
+		assert.equal(component.divs.length, 3, 'three divs are registered (unkeyed array)');
+		component.divs.forEach((e, i) => {
+			assert.equal(e, elems[i], `div ${i} is correct (unkeyed array)`);
+		});
+
+		component.items = ['foo', 'baz'];
+		assert.equal(component.divs.length, 3, 'the divs array is still 3 long');
+		assert.equal(component.divs[2], null, 'the last div is unregistered');
+
+		elems = target.querySelectorAll('div');
+		component.divs.forEach((e, i) => {
+			assert.equal(e, elems[i], `div ${i} is still correct`);
+		});
+	}
+};
diff --git a/test/runtime/samples/_/main.svelte b/test/runtime/samples/_/main.svelte
index 19ec9ea8ce..7923134dcd 100644
--- a/test/runtime/samples/_/main.svelte
+++ b/test/runtime/samples/_/main.svelte
@@ -1,6 +1,8 @@
 <script>
-	let a = 1;
-	let b = 2;
+	export let items = ['foo', 'bar', 'baz'];
+	export let divs = [];
 </script>
 
-<p>{a} + {b} = {a + b}</p>
\ No newline at end of file
+{#each items as item, j}
+	<div bind:this={divs[j]}>{item}</div>
+{/each}
\ No newline at end of file