diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index 929d737700..de0c5dc496 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -98,9 +98,9 @@ class DomGenerator extends Generator {
 		` );
 	}
 
-	createAnchor ( name, description = '' ) {
+	createAnchor ( name ) {
 		this.uses.createComment = true;
-		const renderStatement = `createComment( ${JSON.stringify( description )} )`;
+		const renderStatement = `createComment()`;
 		this.addElement( name, renderStatement, true );
 	}
 
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 2799a421b8..700e16ef7a 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -21,7 +21,7 @@ export default {
 		const { dependencies, snippet } = generator.contextualise( node.expression );
 
 		const anchor = `${name}_anchor`;
-		generator.createAnchor( anchor, `#each ${generator.source.slice( node.expression.start, node.expression.end )}` );
+		generator.createAnchor( anchor );
 
 		generator.current.builders.init.addLine( `var ${name}_value = ${snippet};` );
 		generator.current.builders.init.addLine( `var ${iterations} = [];` );
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index 02133e539d..5ceb42d48b 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -41,7 +41,7 @@ export default {
 		const conditionsAndBlocks = getConditionsAndBlocks( generator, node, generator.getUniqueName( `renderIfBlock` ) );
 
 		const anchor = `${name}_anchor`;
-		generator.createAnchor( anchor, `#if ${generator.source.slice( node.expression.start, node.expression.end )}` );
+		generator.createAnchor( anchor );
 
 		generator.current.builders.init.addBlock( deindent`
 			function ${getBlock} ( ${params} ) {
diff --git a/src/generators/dom/visitors/YieldTag.js b/src/generators/dom/visitors/YieldTag.js
index 5fefcd73a3..98996486c1 100644
--- a/src/generators/dom/visitors/YieldTag.js
+++ b/src/generators/dom/visitors/YieldTag.js
@@ -1,7 +1,7 @@
 export default {
 	enter ( generator ) {
 		const anchor = `yield_anchor`;
-		generator.createAnchor( anchor, 'yield' );
+		generator.createAnchor( anchor );
 
 		generator.current.builders.mount.addLine(
 			`component._yield && component._yield.mount( ${generator.current.target}, ${anchor} );`
diff --git a/src/shared/dom.js b/src/shared/dom.js
index 9d4231572f..4007e90289 100644
--- a/src/shared/dom.js
+++ b/src/shared/dom.js
@@ -34,8 +34,8 @@ export function createText ( data ) {
 	return document.createTextNode( data );
 }
 
-export function createComment ( data ) {
-	return document.createComment( data );
+export function createComment () {
+	return document.createComment( '' );
 }
 
 export function addEventListener ( node, event, handler ) {
diff --git a/test/generator/attribute-dynamic-multiple/_config.js b/test/generator/attribute-dynamic-multiple/_config.js
index 83c6a58a86..1a0c602cb6 100644
--- a/test/generator/attribute-dynamic-multiple/_config.js
+++ b/test/generator/attribute-dynamic-multiple/_config.js
@@ -7,5 +7,5 @@ export default {
 		]
 	},
 
-	html: `<div class="foo ">1</div><div class=" bar">2</div><div class="foo bar">3</div><!--#each items-->`
+	html: `<div class="foo ">1</div><div class=" bar">2</div><div class="foo bar">3</div><!---->`
 };
diff --git a/test/generator/binding-input-text-contextual/_config.js b/test/generator/binding-input-text-contextual/_config.js
index 3f2d3f3fc0..332d2c6f39 100644
--- a/test/generator/binding-input-text-contextual/_config.js
+++ b/test/generator/binding-input-text-contextual/_config.js
@@ -6,7 +6,7 @@ export default {
 			'three'
 		]
 	},
-	html: `<div><input><p>one</p></div><div><input><p>two</p></div><div><input><p>three</p></div><!--#each items-->`,
+	html: `<div><input><p>one</p></div><div><input><p>two</p></div><div><input><p>three</p></div><!---->`,
 	test ( assert, component, target, window ) {
 		const inputs = [ ...target.querySelectorAll( 'input' ) ];
 		const items = component.get( 'items' );
@@ -18,12 +18,12 @@ export default {
 		inputs[1].dispatchEvent( event );
 
 		assert.equal( items[1], 'four' );
-		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>three</p></div><!--#each items-->` );
+		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>three</p></div><!---->` );
 
 		items[2] = 'five';
 
 		component.set({ items });
 		assert.equal( inputs[2].value, 'five' );
-		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>five</p></div><!--#each items-->` );
+		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>five</p></div><!---->` );
 	}
 };
diff --git a/test/generator/binding-input-text-deep-contextual/_config.js b/test/generator/binding-input-text-deep-contextual/_config.js
index f24902a962..587110786c 100644
--- a/test/generator/binding-input-text-deep-contextual/_config.js
+++ b/test/generator/binding-input-text-deep-contextual/_config.js
@@ -6,7 +6,7 @@ export default {
 			{ description: 'three' }
 		]
 	},
-	html: `<div><input><p>one</p></div><div><input><p>two</p></div><div><input><p>three</p></div><!--#each items-->`,
+	html: `<div><input><p>one</p></div><div><input><p>two</p></div><div><input><p>three</p></div><!---->`,
 	test ( assert, component, target, window ) {
 		const inputs = [ ...target.querySelectorAll( 'input' ) ];
 
@@ -17,13 +17,13 @@ export default {
 		inputs[1].value = 'four';
 		inputs[1].dispatchEvent( event );
 
-		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>three</p></div><!--#each items-->` );
+		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>three</p></div><!---->` );
 
 		const items = component.get( 'items' );
 		items[2].description = 'five';
 
 		component.set({ items });
 		assert.equal( inputs[2].value, 'five' );
-		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>five</p></div><!--#each items-->` );
+		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>five</p></div><!---->` );
 	}
 };
diff --git a/test/generator/component-yield-parent/_config.js b/test/generator/component-yield-parent/_config.js
index 28b8e175de..cc3b39ca81 100644
--- a/test/generator/component-yield-parent/_config.js
+++ b/test/generator/component-yield-parent/_config.js
@@ -2,8 +2,8 @@ export default {
 	html: '<div><p>Hello</p></div>',
 	test ( assert, component, target ) {
 		assert.equal( component.get( 'data' ), 'Hello' );
-		component.set({data: 'World'})
+		component.set({data: 'World'});
 		assert.equal( component.get( 'data' ), 'World' );
-		assert.equal( target.innerHTML, '<div><p>World<!--yield--></p></div>' );
+		assert.equal( target.innerHTML, '<div><p>World<!----></p></div>' );
 	}
-}
+};
diff --git a/test/generator/each-block-indexed/_config.js b/test/generator/each-block-indexed/_config.js
index 34640e18cb..5aaadafb05 100644
--- a/test/generator/each-block-indexed/_config.js
+++ b/test/generator/each-block-indexed/_config.js
@@ -2,5 +2,5 @@ export default {
 	data: {
 		animals: [ 'adder', 'blue whale', 'chameleon' ]
 	},
-	html: `<p>0: adder</p><p>1: blue whale</p><p>2: chameleon</p><!--#each animals-->`
+	html: `<p>0: adder</p><p>1: blue whale</p><p>2: chameleon</p><!---->`
 };
diff --git a/test/generator/each-block/_config.js b/test/generator/each-block/_config.js
index 959bf88c04..655556bedf 100644
--- a/test/generator/each-block/_config.js
+++ b/test/generator/each-block/_config.js
@@ -2,11 +2,11 @@ export default {
 	data: {
 		animals: [ 'alpaca', 'baboon', 'capybara' ]
 	},
-	html: '<p>alpaca</p><p>baboon</p><p>capybara</p><!--#each animals-->',
+	html: '<p>alpaca</p><p>baboon</p><p>capybara</p><!---->',
 	test ( assert, component, target ) {
 		component.set({ animals: [ 'alpaca', 'baboon', 'caribou', 'dogfish' ] });
-		assert.equal( target.innerHTML, '<p>alpaca</p><p>baboon</p><p>caribou</p><p>dogfish</p><!--#each animals-->' );
+		assert.equal( target.innerHTML, '<p>alpaca</p><p>baboon</p><p>caribou</p><p>dogfish</p><!---->' );
 		component.set({ animals: [] });
-		assert.equal( target.innerHTML, '<!--#each animals-->' );
+		assert.equal( target.innerHTML, '<!---->' );
 	}
 };
diff --git a/test/generator/each-blocks-expression/_config.js b/test/generator/each-blocks-expression/_config.js
index b610b055b4..239a18b6dc 100644
--- a/test/generator/each-blocks-expression/_config.js
+++ b/test/generator/each-blocks-expression/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>a</p><p>b</p><p>c</p><!--#each [ 'a', 'b', 'c' ]-->`
+	html: `<p>a</p><p>b</p><p>c</p><!---->`
 };
diff --git a/test/generator/each-blocks-nested-b/_config.js b/test/generator/each-blocks-nested-b/_config.js
index 806284ef2d..1ba0f685b8 100644
--- a/test/generator/each-blocks-nested-b/_config.js
+++ b/test/generator/each-blocks-nested-b/_config.js
@@ -28,7 +28,7 @@ export default {
 			}
 		]
 	},
-	html: `<p>animals: aardvark</p><p>animals: buffalo</p><p>animals: chinchilla</p><!--#each category.things--><p>countries: albania</p><p>countries: brazil</p><p>countries: china</p><!--#each category.things--><p>people: alice</p><p>people: bob</p><p>people: carol</p><p>people: dave</p><!--#each category.things--><!--#each categories-->`,
+	html: `<p>animals: aardvark</p><p>animals: buffalo</p><p>animals: chinchilla</p><!----><p>countries: albania</p><p>countries: brazil</p><p>countries: china</p><!----><p>people: alice</p><p>people: bob</p><p>people: carol</p><p>people: dave</p><!----><!---->`,
 	test ( assert, component, target ) {
 		// TODO
 	}
diff --git a/test/generator/each-blocks-nested/_config.js b/test/generator/each-blocks-nested/_config.js
index 0c21561e75..5486c8274e 100644
--- a/test/generator/each-blocks-nested/_config.js
+++ b/test/generator/each-blocks-nested/_config.js
@@ -4,7 +4,7 @@ export default {
 		rows: [ 1, 2, 3 ]
 	},
 
-	html: `<div>a, 1</div><div>a, 2</div><div>a, 3</div><!--#each rows--><div>b, 1</div><div>b, 2</div><div>b, 3</div><!--#each rows--><div>c, 1</div><div>c, 2</div><div>c, 3</div><!--#each rows--><!--#each columns-->`,
+	html: `<div>a, 1</div><div>a, 2</div><div>a, 3</div><!----><div>b, 1</div><div>b, 2</div><div>b, 3</div><!----><div>c, 1</div><div>c, 2</div><div>c, 3</div><!----><!---->`,
 
 	test ( assert, component, target ) {
 		// TODO
diff --git a/test/generator/event-handler-removal/_config.js b/test/generator/event-handler-removal/_config.js
index 91bc0452a5..b196db1765 100644
--- a/test/generator/event-handler-removal/_config.js
+++ b/test/generator/event-handler-removal/_config.js
@@ -1,7 +1,7 @@
 // TODO gah, JSDOM appears to behave differently to real browsers here... probably need to raise an issue
 
 export default {
-	html: '<input><!--#if visible-->',
+	html: '<input><!---->',
 	test ( assert, component ) {
 		component.refs.input.focus();
 
diff --git a/test/generator/event-handler/_config.js b/test/generator/event-handler/_config.js
index 5fb7f6bc86..8aa60ff387 100644
--- a/test/generator/event-handler/_config.js
+++ b/test/generator/event-handler/_config.js
@@ -1,13 +1,13 @@
 export default {
-	html: '<button>toggle</button>\n\n<!--#if visible-->',
+	html: '<button>toggle</button>\n\n<!---->',
 	test ( assert, component, target, window ) {
 		const button = target.querySelector( 'button' );
 		const event = new window.MouseEvent( 'click' );
 
 		button.dispatchEvent( event );
-		assert.equal( target.innerHTML, '<button>toggle</button>\n\n<p>hello!</p><!--#if visible-->' );
+		assert.equal( target.innerHTML, '<button>toggle</button>\n\n<p>hello!</p><!---->' );
 
 		button.dispatchEvent( event );
-		assert.equal( target.innerHTML, '<button>toggle</button>\n\n<!--#if visible-->' );
+		assert.equal( target.innerHTML, '<button>toggle</button>\n\n<!---->' );
 	}
 };
diff --git a/test/generator/if-block-widget/_config.js b/test/generator/if-block-widget/_config.js
index 674fefb0ba..40d9d050e9 100644
--- a/test/generator/if-block-widget/_config.js
+++ b/test/generator/if-block-widget/_config.js
@@ -2,11 +2,11 @@ export default {
 	data: {
 		visible: true
 	},
-	html: 'before\n<p>Widget</p><!--#if visible-->\nafter',
+	html: 'before\n<p>Widget</p><!---->\nafter',
 	test ( assert, component, target ) {
 		component.set({ visible: false });
-		assert.equal( target.innerHTML, 'before\n<!--#if visible-->\nafter' );
+		assert.equal( target.innerHTML, 'before\n<!---->\nafter' );
 		component.set({ visible: true });
-		assert.equal( target.innerHTML, 'before\n<p>Widget</p><!--#if visible-->\nafter' );
+		assert.equal( target.innerHTML, 'before\n<p>Widget</p><!---->\nafter' );
 	}
 };
diff --git a/test/generator/if-block/_config.js b/test/generator/if-block/_config.js
index f8014c5c9a..4194fd29bc 100644
--- a/test/generator/if-block/_config.js
+++ b/test/generator/if-block/_config.js
@@ -2,11 +2,11 @@ export default {
 	data: {
 		visible: true
 	},
-	html: '<p>i am visible</p><!--#if visible-->',
+	html: '<p>i am visible</p><!---->',
 	test ( assert, component, target ) {
 		component.set({ visible: false });
-		assert.equal( target.innerHTML, '<!--#if visible-->' );
+		assert.equal( target.innerHTML, '<!---->' );
 		component.set({ visible: true });
-		assert.equal( target.innerHTML, '<p>i am visible</p><!--#if visible-->' );
+		assert.equal( target.innerHTML, '<p>i am visible</p><!---->' );
 	}
 };