diff --git a/compiler/generate/index.js b/compiler/generate/index.js
index 29af042380..5129f4465e 100644
--- a/compiler/generate/index.js
+++ b/compiler/generate/index.js
@@ -65,8 +65,7 @@ export default function generate ( parsed, template ) {
 		each: 0
 	};
 
-	// TODO add contents of <script> tag, with `export default` replaced with `var template =`
-	// TODO css
+	// TODO (scoped) css
 
 	let current = {
 		useAnchor: false,
@@ -85,18 +84,6 @@ export default function generate ( parsed, template ) {
 		parent: null
 	};
 
-	function flattenExpression ( node, contexts ) {
-		const flattened = flattenReference( node );
-
-		if ( flattened ) {
-			if ( flattened.name in contexts ) return flattened.keypath;
-			// TODO handle globals, e.g. {{Math.round(foo)}}
-			return `root.${flattened.keypath}`;
-		}
-
-		return 'TODO';
-	}
-
 	parsed.html.children.forEach( child => {
 		walkHtml( child, {
 			Element: {
@@ -398,6 +385,7 @@ export default function generate ( parsed, template ) {
 						name: renderer,
 						target: 'target',
 
+						contexts: current.contexts,
 						contextChain: current.contextChain,
 
 						initStatements: [],
diff --git a/compiler/generate/utils/contextualise.js b/compiler/generate/utils/contextualise.js
index 8743506a40..ef305a264f 100644
--- a/compiler/generate/utils/contextualise.js
+++ b/compiler/generate/utils/contextualise.js
@@ -15,6 +15,8 @@ export default function contextualise ( code, expression, contexts ) {
 					code.insertRight( node.start, `root.` );
 					if ( !~usedContexts.indexOf( 'root' ) ) usedContexts.push( 'root' );
 				}
+
+				this.skip();
 			}
 		}
 	});