diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts
index d5ca344470..c57cee27c3 100644
--- a/src/generators/Generator.ts
+++ b/src/generators/Generator.ts
@@ -214,8 +214,7 @@ export default class Generator {
 		isEventHandler: boolean
 	): {
 		contexts: Set<string>,
-		indexes: Set<string>,
-		snippet: string
+		indexes: Set<string>
 	} {
 		// this.addSourcemapLocations(expression);
 
@@ -299,8 +298,7 @@ export default class Generator {
 
 		return {
 			contexts: usedContexts,
-			indexes: usedIndexes,
-			snippet: `[✂${expression.start}-${expression.end}✂]`,
+			indexes: usedIndexes
 		};
 	}
 
@@ -694,6 +692,7 @@ export default class Generator {
 			});
 
 			return {
+				snippet: `[✂${node.start}-${node.end}✂]`,
 				dependencies: Array.from(dependencies)
 			};
 		}
@@ -721,7 +720,6 @@ export default class Generator {
 							const name = node.destructuredContexts[i];
 							const value = `${node.context}[${i}]`;
 
-							// contexts.set(node.destructuredContexts[i], `${context}[${i}]`);
 							contextDependencies.set(name, node.metadata.dependencies);
 						}
 					}
diff --git a/src/generators/dom/visitors/Component.ts b/src/generators/dom/visitors/Component.ts
index 0add0d37b8..bfd52559d6 100644
--- a/src/generators/dom/visitors/Component.ts
+++ b/src/generators/dom/visitors/Component.ts
@@ -352,8 +352,8 @@ function mungeAttribute(attribute: Node, block: Block): Attribute {
 		}
 
 		// simple dynamic attributes
-		const { snippet } = block.contextualise(value.expression);
-		const dependencies = value.metadata.dependencies;
+		block.contextualise(value.expression); // TODO remove
+		const { dependencies, snippet } = value.metadata;
 
 		// TODO only update attributes that have changed
 		return {
@@ -374,16 +374,14 @@ function mungeAttribute(attribute: Node, block: Block): Attribute {
 				if (chunk.type === 'Text') {
 					return stringify(chunk.data);
 				} else {
-					const { snippet } = block.contextualise(
-						chunk.expression
-					);
-					const dependencies = chunk.metadata.dependencies;
+					block.contextualise(chunk.expression); // TODO remove
+					const { dependencies, snippet } = chunk.metadata;
 
-					dependencies.forEach(dependency => {
+					dependencies.forEach((dependency: string) => {
 						allDependencies.add(dependency);
 					});
 
-					return getExpressionPrecedence(chunk.expression) <= 13 ? `( ${snippet} )` : snippet;
+					return getExpressionPrecedence(chunk.expression) <= 13 ? `(${snippet})` : snippet;
 				}
 			})
 			.join(' + ');
@@ -398,10 +396,8 @@ function mungeAttribute(attribute: Node, block: Block): Attribute {
 
 function mungeBinding(binding: Node, block: Block): Binding {
 	const { name } = getObject(binding.value);
-	const { snippet, contexts } = block.contextualise(
-		binding.value
-	);
-	const dependencies = binding.metadata.dependencies;
+	const { contexts } = block.contextualise(binding.value);
+	const { dependencies, snippet } = binding.metadata;
 
 	const contextual = block.contexts.has(name);
 
diff --git a/src/generators/dom/visitors/EachBlock.ts b/src/generators/dom/visitors/EachBlock.ts
index c2b61c1177..68b2c38c15 100644
--- a/src/generators/dom/visitors/EachBlock.ts
+++ b/src/generators/dom/visitors/EachBlock.ts
@@ -45,7 +45,8 @@ export default function visitEachBlock(
 		mountOrIntro,
 	};
 
-	const { snippet } = block.contextualise(node.expression);
+	block.contextualise(node.expression);
+	const { snippet } = node.metadata;
 
 	block.builders.init.addLine(`var ${each_block_value} = ${snippet};`);
 
@@ -362,7 +363,7 @@ function unkeyed(
 	block: Block,
 	state: State,
 	node: Node,
-	snippet,
+	snippet: string,
 	{
 		create_each_block,
 		each_block_value,
@@ -402,8 +403,8 @@ function unkeyed(
 		}
 	`);
 
-	const dependencies = node.metadata.dependencies;
 	const allDependencies = new Set(node._block.dependencies);
+	const { dependencies } = node.metadata;
 	dependencies.forEach((dependency: string) => {
 		allDependencies.add(dependency);
 	});
diff --git a/src/generators/dom/visitors/Element/Attribute.ts b/src/generators/dom/visitors/Element/Attribute.ts
index b76a24a10d..a812b74fce 100644
--- a/src/generators/dom/visitors/Element/Attribute.ts
+++ b/src/generators/dom/visitors/Element/Attribute.ts
@@ -72,8 +72,8 @@ export default function visitAttribute(
 		if (attribute.value.length === 1) {
 			// single {{tag}} — may be a non-string
 			const { expression } = attribute.value[0];
-			const { snippet, indexes } = block.contextualise(expression);
-			const dependencies = attribute.value[0].metadata.dependencies;
+			const { indexes } = block.contextualise(expression);
+			const { dependencies, snippet } = attribute.value[0].metadata;
 
 			value = snippet;
 			dependencies.forEach(d => {
@@ -96,8 +96,8 @@ export default function visitAttribute(
 						if (chunk.type === 'Text') {
 							return stringify(chunk.data);
 						} else {
-							const { snippet, indexes } = block.contextualise(chunk.expression);
-							const dependencies = chunk.metadata.dependencies;
+							const { indexes } = block.contextualise(chunk.expression);
+							const { dependencies, snippet } = chunk.metadata;
 
 							if (Array.from(indexes).some(index => block.changeableIndexes.get(index))) {
 								hasChangeableIndex = true;
diff --git a/src/generators/dom/visitors/Element/StyleAttribute.ts b/src/generators/dom/visitors/Element/StyleAttribute.ts
index 391d4b2a72..36bb79e757 100644
--- a/src/generators/dom/visitors/Element/StyleAttribute.ts
+++ b/src/generators/dom/visitors/Element/StyleAttribute.ts
@@ -36,8 +36,8 @@ export default function visitStyleAttribute(
 						if (chunk.type === 'Text') {
 							return stringify(chunk.data);
 						} else {
-							const { snippet, indexes } = block.contextualise(chunk.expression);
-							const dependencies = chunk.metadata.dependencies;
+							const { indexes } = block.contextualise(chunk.expression);
+							const { dependencies, snippet } = chunk.metadata;
 
 							if (Array.from(indexes).some(index => block.changeableIndexes.get(index))) {
 								hasChangeableIndex = true;
diff --git a/src/generators/dom/visitors/Element/addBindings.ts b/src/generators/dom/visitors/Element/addBindings.ts
index 17e921df14..a2433abf93 100644
--- a/src/generators/dom/visitors/Element/addBindings.ts
+++ b/src/generators/dom/visitors/Element/addBindings.ts
@@ -92,9 +92,8 @@ export default function addBindings(
 		let updateCondition: string;
 
 		const { name } = getObject(binding.value);
-		const { snippet, contexts } = block.contextualise(
-			binding.value
-		);
+		const { contexts } = block.contextualise(binding.value);
+		const { snippet } = binding.metadata;
 
 		// special case: if you have e.g. `<input type=checkbox bind:checked=selected.done>`
 		// and `selected` is an object chosen with a <select>, then when `checked` changes,
diff --git a/src/generators/dom/visitors/Element/addTransitions.ts b/src/generators/dom/visitors/Element/addTransitions.ts
index 08cc196f7f..26ff6f048e 100644
--- a/src/generators/dom/visitors/Element/addTransitions.ts
+++ b/src/generators/dom/visitors/Element/addTransitions.ts
@@ -15,10 +15,13 @@ export default function addTransitions(
 
 	if (!intro && !outro) return;
 
+	if (intro) block.contextualise(intro.expression); // TODO remove all these
+	if (outro) block.contextualise(outro.expression);
+
 	if (intro === outro) {
 		const name = block.getUniqueName(`${node.var}_transition`);
 		const snippet = intro.expression
-			? block.contextualise(intro.expression).snippet
+			? intro.expression.metadata.snippet
 			: '{}';
 
 		block.addVariable(name);
@@ -48,7 +51,7 @@ export default function addTransitions(
 		if (intro) {
 			block.addVariable(introName);
 			const snippet = intro.expression
-				? block.contextualise(intro.expression).snippet
+				? intro.expression.metadata.snippet
 				: '{}';
 
 			const fn = `%transitions-${intro.name}`; // TODO add built-in transitions?
@@ -73,7 +76,7 @@ export default function addTransitions(
 		if (outro) {
 			block.addVariable(outroName);
 			const snippet = outro.expression
-				? block.contextualise(outro.expression).snippet
+				? intro.expression.metadata.snippet
 				: '{}';
 
 			const fn = `%transitions-${outro.name}`;
diff --git a/src/generators/dom/visitors/IfBlock.ts b/src/generators/dom/visitors/IfBlock.ts
index 6c939a698e..33a90a32a2 100644
--- a/src/generators/dom/visitors/IfBlock.ts
+++ b/src/generators/dom/visitors/IfBlock.ts
@@ -24,9 +24,11 @@ function getBranches(
 	elementStack: Node[],
 	componentStack: Node[]
 ) {
+	block.contextualise(node.expression); // TODO remove
+
 	const branches = [
 		{
-			condition: block.contextualise(node.expression).snippet,
+			condition: node.metadata.snippet,
 			block: node._block.name,
 			hasUpdateMethod: node._block.hasUpdateMethod,
 			hasIntroMethod: node._block.hasIntroMethod,
diff --git a/src/generators/dom/visitors/shared/Tag.ts b/src/generators/dom/visitors/shared/Tag.ts
index bf28f77f0d..654c2e7cbf 100644
--- a/src/generators/dom/visitors/shared/Tag.ts
+++ b/src/generators/dom/visitors/shared/Tag.ts
@@ -12,8 +12,8 @@ export default function visitTag(
 	name: string,
 	update: (value: string) => string
 ) {
-	const { indexes, snippet } = block.contextualise(node.expression);
-	const dependencies = node.metadata.dependencies;
+	const { indexes } = block.contextualise(node.expression);
+	const { dependencies, snippet } = node.metadata;
 
 	const hasChangeableIndex = Array.from(indexes).some(index => block.changeableIndexes.get(index));
 
diff --git a/src/generators/server-side-rendering/visitors/Component.ts b/src/generators/server-side-rendering/visitors/Component.ts
index 0ab6604be3..b582dc13d9 100644
--- a/src/generators/server-side-rendering/visitors/Component.ts
+++ b/src/generators/server-side-rendering/visitors/Component.ts
@@ -16,7 +16,8 @@ export default function visitComponent(
 	function stringifyAttribute(chunk: Node) {
 		if (chunk.type === 'Text') return chunk.data;
 		if (chunk.type === 'MustacheTag') {
-			const { snippet } = block.contextualise(chunk.expression);
+			block.contextualise(chunk.expression);
+			const { snippet } = chunk.metadata;
 			return '${__escape( ' + snippet + ')}';
 		}
 	}
@@ -45,7 +46,8 @@ export default function visitComponent(
 				if (chunk.type === 'Text') {
 					value = isNaN(chunk.data) ? stringify(chunk.data) : chunk.data;
 				} else {
-					const { snippet } = block.contextualise(chunk.expression);
+					block.contextualise(chunk.expression);
+					const { snippet } = chunk.metadata;
 					value = snippet;
 				}
 			} else {
diff --git a/src/generators/server-side-rendering/visitors/EachBlock.ts b/src/generators/server-side-rendering/visitors/EachBlock.ts
index b2e7c8ad58..ae5c449b5a 100644
--- a/src/generators/server-side-rendering/visitors/EachBlock.ts
+++ b/src/generators/server-side-rendering/visitors/EachBlock.ts
@@ -8,7 +8,8 @@ export default function visitEachBlock(
 	block: Block,
 	node: Node
 ) {
-	const { dependencies, snippet } = block.contextualise(node.expression);
+	block.contextualise(node.expression);
+	const { dependencies, snippet } = node.metadata;
 
 	const open = `\${ ${node.else ? `${snippet}.length ? ` : ''}${snippet}.map(${node.index ? `(${node.context}, ${node.index})` : node.context} => \``;
 	generator.append(open);
diff --git a/src/generators/server-side-rendering/visitors/Element.ts b/src/generators/server-side-rendering/visitors/Element.ts
index 058ba7a0a7..e1d7e197d0 100644
--- a/src/generators/server-side-rendering/visitors/Element.ts
+++ b/src/generators/server-side-rendering/visitors/Element.ts
@@ -19,7 +19,8 @@ function stringifyAttributeValue(block: Block, chunks: Node[]) {
 				return escape(chunk.data).replace(/"/g, '&quot;');
 			}
 
-			const { snippet } = block.contextualise(chunk.expression);
+			block.contextualise(chunk.expression);
+			const { snippet } = chunk.metadata;
 			return '${' + snippet + '}';
 		})
 		.join('');
diff --git a/src/generators/server-side-rendering/visitors/IfBlock.ts b/src/generators/server-side-rendering/visitors/IfBlock.ts
index 6c758d6358..88de7f0b5a 100644
--- a/src/generators/server-side-rendering/visitors/IfBlock.ts
+++ b/src/generators/server-side-rendering/visitors/IfBlock.ts
@@ -8,7 +8,8 @@ export default function visitIfBlock(
 	block: Block,
 	node: Node
 ) {
-	const { snippet } = block.contextualise(node.expression);
+	block.contextualise(node.expression);
+	const { snippet } = node.metadata;
 
 	generator.append('${ ' + snippet + ' ? `');
 
diff --git a/src/generators/server-side-rendering/visitors/MustacheTag.ts b/src/generators/server-side-rendering/visitors/MustacheTag.ts
index cef796b5a5..29fa7aa083 100644
--- a/src/generators/server-side-rendering/visitors/MustacheTag.ts
+++ b/src/generators/server-side-rendering/visitors/MustacheTag.ts
@@ -7,6 +7,8 @@ export default function visitMustacheTag(
 	block: Block,
 	node: Node
 ) {
-	const { snippet } = block.contextualise(node.expression);
+	block.contextualise(node.expression);
+	const { snippet } = node.metadata;
+
 	generator.append('${__escape(' + snippet + ')}');
 }
diff --git a/src/generators/server-side-rendering/visitors/RawMustacheTag.ts b/src/generators/server-side-rendering/visitors/RawMustacheTag.ts
index 8112349d04..9bceda902d 100644
--- a/src/generators/server-side-rendering/visitors/RawMustacheTag.ts
+++ b/src/generators/server-side-rendering/visitors/RawMustacheTag.ts
@@ -7,6 +7,8 @@ export default function visitRawMustacheTag(
 	block: Block,
 	node: Node
 ) {
-	const { snippet } = block.contextualise(node.expression);
+	block.contextualise(node.expression);
+	const { snippet } = node.metadata;
+
 	generator.append('${' + snippet + '}');
 }
diff --git a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/_config.js b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/_config.js
index 2944111fd9..37d94a1609 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/_config.js
+++ b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/_config.js
@@ -7,7 +7,7 @@ export default {
 	},
 
 	html: `<svg><rect x="0" y="0" width="100" height="100"></rect></svg>`,
-	
+
 	test ( assert, component, target ) {
 		const svg = target.querySelector( 'svg' );
 		const rect = target.querySelector( 'rect' );