diff --git a/src/compile/nodes/shared/Expression.ts b/src/compile/nodes/shared/Expression.ts
index 36a2ae74d6..0bb524ff35 100644
--- a/src/compile/nodes/shared/Expression.ts
+++ b/src/compile/nodes/shared/Expression.ts
@@ -170,16 +170,13 @@ export default class Expression {
 	render() {
 		if (this.rendered) return this.rendered;
 
-		// <option> value attribute could be synthetic — avoid double editing
-		// TODO move this logic into Element?
-		if (this.is_synthetic) return;
-
 		const {
 			component,
 			declarations,
 			scope_map: map,
 			template_scope,
-			owner
+			owner,
+			is_synthetic
 		} = this;
 		let scope = this.scope;
 
@@ -221,7 +218,7 @@ export default class Expression {
 							dependencies.add(name);
 							component.expectedProperties.add(name);
 						}
-					} else {
+					} else if (!is_synthetic) {
 						code.prependRight(node.start, key === 'key' && parent.shorthand
 							? `${name}: ctx.`
 							: 'ctx.');
diff --git a/src/compile/render-dom/wrappers/InlineComponent/index.ts b/src/compile/render-dom/wrappers/InlineComponent/index.ts
index 0891aa2126..c7111873c4 100644
--- a/src/compile/render-dom/wrappers/InlineComponent/index.ts
+++ b/src/compile/render-dom/wrappers/InlineComponent/index.ts
@@ -263,13 +263,16 @@ export default class InlineComponentWrapper extends Wrapper {
 		});
 
 		const munged_handlers = this.node.handlers.map(handler => {
+			// TODO return declarations from handler.render()?
+			const snippet = handler.render();
+
 			if (handler.expression) {
 				handler.expression.declarations.forEach(declaration => {
 					block.builders.init.addBlock(declaration);
 				});
 			}
 
-			return `${name}.$on("${handler.name}", ${handler.render()});`;
+			return `${name}.$on("${handler.name}", ${snippet});`;
 		});
 
 		if (this.node.name === 'svelte:component') {
diff --git a/test/runtime/index.js b/test/runtime/index.js
index 24cc5f0ebf..acce9091d9 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -28,7 +28,7 @@ function getName(filename) {
 const sveltePath = process.cwd();
 const internal = path.join(sveltePath, 'internal.js');
 
-describe.only("runtime", () => {
+describe("runtime", () => {
 	before(() => {
 		svelte = loadSvelte(false);
 		svelte$ = loadSvelte(true);
diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js
index a8d68aeaca..de57f49090 100644
--- a/test/server-side-rendering/index.js
+++ b/test/server-side-rendering/index.js
@@ -21,7 +21,7 @@ function tryToReadFile(file) {
 
 const sveltePath = process.cwd();
 
-describe.only("ssr", () => {
+describe("ssr", () => {
 	before(() => {
 		require("../../register")({
 			extensions: ['.svelte', '.html'],