diff --git a/src/ast/nodes/ArrowFunctionExpression.js b/src/ast/nodes/ArrowFunctionExpression.js
index 2071965..257c7a3 100644
--- a/src/ast/nodes/ArrowFunctionExpression.js
+++ b/src/ast/nodes/ArrowFunctionExpression.js
@@ -3,8 +3,22 @@ import Scope from '../scopes/Scope.js';
 import extractNames from '../utils/extractNames.js';
 
 export default class ArrowFunctionExpression extends Node {
+	bind ( scope ) {
+		super.bind( this.scope || scope );
+	}
+
+	findScope ( functionScope ) {
+		return this.scope || this.parent.findScope( functionScope );
+	}
+
+	hasEffects () {
+		return false;
+	}
+
 	initialise ( scope ) {
-		if ( this.body.type !== 'BlockStatement' ) {
+		if ( this.body.type === 'BlockStatement' ) {
+			this.body.createScope( scope );
+		} else {
 			this.scope = new Scope({
 				parent: scope,
 				isBlockScope: false,
@@ -18,18 +32,7 @@ export default class ArrowFunctionExpression extends Node {
 			}
 		}
 
+		scope = this.scope || this.body.scope;
 		super.initialise( scope );
 	}
-
-	bind ( scope ) {
-		super.bind( this.scope || scope );
-	}
-
-	findScope ( functionScope ) {
-		return this.scope || this.parent.findScope( functionScope );
-	}
-
-	hasEffects () {
-		return false;
-	}
 }
diff --git a/src/ast/nodes/AssignmentExpression.js b/src/ast/nodes/AssignmentExpression.js
index b8dc0e2..f1fbcf3 100644
--- a/src/ast/nodes/AssignmentExpression.js
+++ b/src/ast/nodes/AssignmentExpression.js
@@ -35,11 +35,13 @@ export default class AssignmentExpression extends Node {
 	}
 
 	initialise ( scope ) {
+		this.scope = scope;
+
 		this.module.bundle.dependentExpressions.push( this );
 		super.initialise( scope );
 	}
 
 	isUsedByBundle () {
-		return isUsedByBundle( this.findScope(), this.subject );
+		return isUsedByBundle( this.scope, this.subject );
 	}
 }
diff --git a/src/ast/nodes/BlockStatement.js b/src/ast/nodes/BlockStatement.js
index ea341d5..78e6e67 100644
--- a/src/ast/nodes/BlockStatement.js
+++ b/src/ast/nodes/BlockStatement.js
@@ -1,8 +1,8 @@
-import Node from '../Node.js';
+import Statement from './shared/Statement.js';
 import Scope from '../scopes/Scope.js';
 import extractNames from '../utils/extractNames.js';
 
-export default class BlockStatement extends Node {
+export default class BlockStatement extends Statement {
 	bind () {
 		for ( const node of this.body ) {
 			node.bind( this.scope );
@@ -14,9 +14,9 @@ export default class BlockStatement extends Node {
 		this.isFunctionBlock = this.parentIsFunction || this.parent.type === 'Module';
 
 		this.scope = new Scope({
+			parent,
 			isBlockScope: !this.isFunctionBlock,
 			isLexicalBoundary: this.isFunctionBlock && this.parent.type !== 'ArrowFunctionExpression',
-			parent: parent || this.parent.findScope( false ), // TODO always supply parent
 			owner: this // TODO is this used anywhere?
 		});
 
@@ -35,14 +35,8 @@ export default class BlockStatement extends Node {
 		return functionScope && !this.isFunctionBlock ? this.parent.findScope( functionScope ) : this.scope;
 	}
 
-	hasEffects () {
-		for ( const node of this.body ) {
-			if ( node.hasEffects( this.scope ) ) return true;
-		}
-	}
-
-	initialise () {
-		if ( !this.scope ) this.createScope(); // scope can be created early in some cases, e.g for (let i... )
+	initialise ( scope ) {
+		if ( !this.scope ) this.createScope( scope ); // scope can be created early in some cases, e.g for (let i... )
 
 		let lastNode;
 		for ( const node of this.body ) {
@@ -52,20 +46,4 @@ export default class BlockStatement extends Node {
 			lastNode = node;
 		}
 	}
-
-	render ( code, es ) {
-		for ( const node of this.body ) {
-			node.render( code, es );
-		}
-	}
-
-	run () {
-		if ( this.ran ) return;
-		this.ran = true;
-
-		for ( const node of this.body ) {
-			// TODO only include non-top-level statements if necessary
-			node.run( this.scope );
-		}
-	}
 }
diff --git a/src/ast/nodes/EmptyStatement.js b/src/ast/nodes/EmptyStatement.js
new file mode 100644
index 0000000..27830c4
--- /dev/null
+++ b/src/ast/nodes/EmptyStatement.js
@@ -0,0 +1,7 @@
+import Statement from './shared/Statement.js';
+
+export default class EmptyStatement extends Statement {
+	render ( code ) {
+		code.remove( this.start, this.end );
+	}
+}
diff --git a/src/ast/nodes/ForInStatement.js b/src/ast/nodes/ForInStatement.js
index a59bfd2..0838aa1 100644
--- a/src/ast/nodes/ForInStatement.js
+++ b/src/ast/nodes/ForInStatement.js
@@ -4,7 +4,8 @@ import { STRING } from '../values.js';
 
 export default class ForInStatement extends Statement {
 	initialise ( scope ) {
-		super.initialise( scope );
-		assignTo( this.left, scope, STRING );
+		this.body.createScope( scope );
+		super.initialise( this.body.scope );
+		assignTo( this.left, this.body.scope, STRING );
 	}
 }
diff --git a/src/ast/nodes/ForOfStatement.js b/src/ast/nodes/ForOfStatement.js
index 9e663a0..e761433 100644
--- a/src/ast/nodes/ForOfStatement.js
+++ b/src/ast/nodes/ForOfStatement.js
@@ -4,7 +4,8 @@ import { UNKNOWN } from '../values.js';
 
 export default class ForOfStatement extends Statement {
 	initialise ( scope ) {
-		super.initialise( scope );
-		assignTo( this.left, scope, UNKNOWN );
+		this.body.createScope( scope );
+		super.initialise( this.body.scope );
+		assignTo( this.left, this.body.scope, UNKNOWN );
 	}
 }
diff --git a/src/ast/nodes/ForStatement.js b/src/ast/nodes/ForStatement.js
new file mode 100644
index 0000000..bd5a57f
--- /dev/null
+++ b/src/ast/nodes/ForStatement.js
@@ -0,0 +1,31 @@
+import Statement from './shared/Statement.js';
+
+export default class ForStatement extends Statement {
+	bind () {
+		const scope = this.body.scope;
+
+		this.init.bind( scope );
+		this.test.bind( scope );
+		this.update.bind( scope );
+		this.body.bind( scope );
+	}
+
+	hasEffects () {
+		return super.hasEffects( this.body.scope );
+	}
+
+	initialise ( scope ) {
+		this.body.createScope( scope );
+		scope = this.body.scope;
+
+		// can't use super, because we need to control the order
+		this.init.initialise( scope );
+		this.test.initialise( scope );
+		this.update.initialise( scope );
+		this.body.initialise( scope );
+	}
+
+	run ( scope ) {
+		super.run( scope );
+	}
+}
diff --git a/src/ast/nodes/FunctionDeclaration.js b/src/ast/nodes/FunctionDeclaration.js
index 96cba0c..dffed95 100644
--- a/src/ast/nodes/FunctionDeclaration.js
+++ b/src/ast/nodes/FunctionDeclaration.js
@@ -36,11 +36,11 @@ export default class FunctionDeclaration extends Node {
 		this.name = this.id.name; // may be overridden by bundle.deconflict
 		scope.addDeclaration( this.name, this, false, false );
 
-		this.body.createScope();
+		this.body.createScope( scope );
 
 		this.id.initialise( scope );
 		this.params.forEach( param => param.initialise( this.body.scope ) );
-		this.body.initialise( scope );
+		this.body.initialise();
 	}
 
 	render ( code, es ) {
diff --git a/src/ast/nodes/FunctionExpression.js b/src/ast/nodes/FunctionExpression.js
index 56c87ee..4d170af 100644
--- a/src/ast/nodes/FunctionExpression.js
+++ b/src/ast/nodes/FunctionExpression.js
@@ -11,8 +11,8 @@ export default class FunctionExpression extends Node {
 		return false;
 	}
 
-	initialise () {
-		this.body.createScope(); // TODO we'll also need to do this for For[Of|In]Statement
+	initialise ( scope ) {
+		this.body.createScope( scope );
 
 		if ( this.id ) this.id.initialise( this.body.scope );
 		this.params.forEach( param => param.initialise( this.body.scope ) );
diff --git a/src/ast/nodes/index.js b/src/ast/nodes/index.js
index b5babe0..94d2f4c 100644
--- a/src/ast/nodes/index.js
+++ b/src/ast/nodes/index.js
@@ -7,10 +7,12 @@ import CallExpression from './CallExpression.js';
 import ClassDeclaration from './ClassDeclaration.js';
 import ClassExpression from './ClassExpression.js';
 import ConditionalExpression from './ConditionalExpression.js';
+import EmptyStatement from './EmptyStatement.js';
 import ExportAllDeclaration from './ExportAllDeclaration.js';
 import ExportDefaultDeclaration from './ExportDefaultDeclaration.js';
 import ExportNamedDeclaration from './ExportNamedDeclaration.js';
 import ExpressionStatement from './ExpressionStatement.js';
+import ForStatement from './ForStatement.js';
 import ForInStatement from './ForInStatement.js';
 import ForOfStatement from './ForOfStatement.js';
 import FunctionDeclaration from './FunctionDeclaration.js';
@@ -24,6 +26,7 @@ import NewExpression from './NewExpression.js';
 import ObjectExpression from './ObjectExpression.js';
 import ParenthesizedExpression from './ParenthesizedExpression.js';
 import ReturnStatement from './ReturnStatement.js';
+import Statement from './shared/Statement.js';
 import TemplateLiteral from './TemplateLiteral.js';
 import ThisExpression from './ThisExpression.js';
 import ThrowStatement from './ThrowStatement.js';
@@ -42,10 +45,13 @@ export default {
 	ClassDeclaration,
 	ClassExpression,
 	ConditionalExpression,
+	DoWhileStatement: Statement,
+	EmptyStatement,
 	ExportAllDeclaration,
 	ExportDefaultDeclaration,
 	ExportNamedDeclaration,
 	ExpressionStatement,
+	ForStatement,
 	ForInStatement,
 	ForOfStatement,
 	FunctionDeclaration,
@@ -59,11 +65,14 @@ export default {
 	ObjectExpression,
 	ParenthesizedExpression,
 	ReturnStatement,
+	SwitchStatement: Statement,
 	TemplateLiteral,
 	ThisExpression,
 	ThrowStatement,
+	TryStatement: Statement,
 	UnaryExpression,
 	UpdateExpression,
 	VariableDeclarator,
-	VariableDeclaration
+	VariableDeclaration,
+	WhileStatement: Statement
 };
diff --git a/test/form/empty-block-statement/_config.js b/test/form/empty-block-statement/_config.js
new file mode 100644
index 0000000..283b0b6
--- /dev/null
+++ b/test/form/empty-block-statement/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'removes an empty block statement'
+};
diff --git a/test/form/empty-block-statement/_expected/amd.js b/test/form/empty-block-statement/_expected/amd.js
new file mode 100644
index 0000000..6036f28
--- /dev/null
+++ b/test/form/empty-block-statement/_expected/amd.js
@@ -0,0 +1,6 @@
+define(function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+});
diff --git a/test/form/empty-block-statement/_expected/cjs.js b/test/form/empty-block-statement/_expected/cjs.js
new file mode 100644
index 0000000..33f9de0
--- /dev/null
+++ b/test/form/empty-block-statement/_expected/cjs.js
@@ -0,0 +1,4 @@
+'use strict';
+
+console.log( 1 );
+console.log( 2 );
diff --git a/test/form/empty-block-statement/_expected/es.js b/test/form/empty-block-statement/_expected/es.js
new file mode 100644
index 0000000..472e544
--- /dev/null
+++ b/test/form/empty-block-statement/_expected/es.js
@@ -0,0 +1,2 @@
+console.log( 1 );
+console.log( 2 );
diff --git a/test/form/empty-block-statement/_expected/iife.js b/test/form/empty-block-statement/_expected/iife.js
new file mode 100644
index 0000000..08a84a9
--- /dev/null
+++ b/test/form/empty-block-statement/_expected/iife.js
@@ -0,0 +1,7 @@
+(function () {
+	'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+}());
diff --git a/test/form/empty-block-statement/_expected/umd.js b/test/form/empty-block-statement/_expected/umd.js
new file mode 100644
index 0000000..0aae43f
--- /dev/null
+++ b/test/form/empty-block-statement/_expected/umd.js
@@ -0,0 +1,10 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+})));
diff --git a/test/form/empty-block-statement/main.js b/test/form/empty-block-statement/main.js
new file mode 100644
index 0000000..edca010
--- /dev/null
+++ b/test/form/empty-block-statement/main.js
@@ -0,0 +1,5 @@
+console.log( 1 );
+{
+	// empty
+}
+console.log( 2 );
diff --git a/test/form/empty-do-while-statement/_config.js b/test/form/empty-do-while-statement/_config.js
new file mode 100644
index 0000000..00672ed
--- /dev/null
+++ b/test/form/empty-do-while-statement/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'removes an empty do-while statement'
+};
diff --git a/test/form/empty-do-while-statement/_expected/amd.js b/test/form/empty-do-while-statement/_expected/amd.js
new file mode 100644
index 0000000..e44e556
--- /dev/null
+++ b/test/form/empty-do-while-statement/_expected/amd.js
@@ -0,0 +1,6 @@
+define(function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+});
\ No newline at end of file
diff --git a/test/form/empty-do-while-statement/_expected/cjs.js b/test/form/empty-do-while-statement/_expected/cjs.js
new file mode 100644
index 0000000..1afb143
--- /dev/null
+++ b/test/form/empty-do-while-statement/_expected/cjs.js
@@ -0,0 +1,4 @@
+'use strict';
+
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-do-while-statement/_expected/es.js b/test/form/empty-do-while-statement/_expected/es.js
new file mode 100644
index 0000000..f97f3d0
--- /dev/null
+++ b/test/form/empty-do-while-statement/_expected/es.js
@@ -0,0 +1,2 @@
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-do-while-statement/_expected/iife.js b/test/form/empty-do-while-statement/_expected/iife.js
new file mode 100644
index 0000000..39aedbf
--- /dev/null
+++ b/test/form/empty-do-while-statement/_expected/iife.js
@@ -0,0 +1,7 @@
+(function () {
+	'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+}());
\ No newline at end of file
diff --git a/test/form/empty-do-while-statement/_expected/umd.js b/test/form/empty-do-while-statement/_expected/umd.js
new file mode 100644
index 0000000..0445193
--- /dev/null
+++ b/test/form/empty-do-while-statement/_expected/umd.js
@@ -0,0 +1,10 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+})));
\ No newline at end of file
diff --git a/test/form/empty-do-while-statement/main.js b/test/form/empty-do-while-statement/main.js
new file mode 100644
index 0000000..8b04429
--- /dev/null
+++ b/test/form/empty-do-while-statement/main.js
@@ -0,0 +1,6 @@
+console.log( 1 );
+var condition = true;
+do {
+	condition = false;
+} while ( condition );
+console.log( 2 );
diff --git a/test/form/empty-for-in-statement/_config.js b/test/form/empty-for-in-statement/_config.js
new file mode 100644
index 0000000..b95837c
--- /dev/null
+++ b/test/form/empty-for-in-statement/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'removes an empty for-in statement'
+};
diff --git a/test/form/empty-for-in-statement/_expected/amd.js b/test/form/empty-for-in-statement/_expected/amd.js
new file mode 100644
index 0000000..e44e556
--- /dev/null
+++ b/test/form/empty-for-in-statement/_expected/amd.js
@@ -0,0 +1,6 @@
+define(function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+});
\ No newline at end of file
diff --git a/test/form/empty-for-in-statement/_expected/cjs.js b/test/form/empty-for-in-statement/_expected/cjs.js
new file mode 100644
index 0000000..1afb143
--- /dev/null
+++ b/test/form/empty-for-in-statement/_expected/cjs.js
@@ -0,0 +1,4 @@
+'use strict';
+
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-for-in-statement/_expected/es.js b/test/form/empty-for-in-statement/_expected/es.js
new file mode 100644
index 0000000..f97f3d0
--- /dev/null
+++ b/test/form/empty-for-in-statement/_expected/es.js
@@ -0,0 +1,2 @@
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-for-in-statement/_expected/iife.js b/test/form/empty-for-in-statement/_expected/iife.js
new file mode 100644
index 0000000..39aedbf
--- /dev/null
+++ b/test/form/empty-for-in-statement/_expected/iife.js
@@ -0,0 +1,7 @@
+(function () {
+	'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+}());
\ No newline at end of file
diff --git a/test/form/empty-for-in-statement/_expected/umd.js b/test/form/empty-for-in-statement/_expected/umd.js
new file mode 100644
index 0000000..0445193
--- /dev/null
+++ b/test/form/empty-for-in-statement/_expected/umd.js
@@ -0,0 +1,10 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+})));
\ No newline at end of file
diff --git a/test/form/empty-for-in-statement/main.js b/test/form/empty-for-in-statement/main.js
new file mode 100644
index 0000000..cb706f7
--- /dev/null
+++ b/test/form/empty-for-in-statement/main.js
@@ -0,0 +1,5 @@
+console.log( 1 );
+for ( const i in whatever ) {
+	// do nothing
+}
+console.log( 2 );
diff --git a/test/form/empty-for-of-statement/_config.js b/test/form/empty-for-of-statement/_config.js
new file mode 100644
index 0000000..4a7bd91
--- /dev/null
+++ b/test/form/empty-for-of-statement/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'removes an empty for-of statement'
+};
diff --git a/test/form/empty-for-of-statement/_expected/amd.js b/test/form/empty-for-of-statement/_expected/amd.js
new file mode 100644
index 0000000..e44e556
--- /dev/null
+++ b/test/form/empty-for-of-statement/_expected/amd.js
@@ -0,0 +1,6 @@
+define(function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+});
\ No newline at end of file
diff --git a/test/form/empty-for-of-statement/_expected/cjs.js b/test/form/empty-for-of-statement/_expected/cjs.js
new file mode 100644
index 0000000..1afb143
--- /dev/null
+++ b/test/form/empty-for-of-statement/_expected/cjs.js
@@ -0,0 +1,4 @@
+'use strict';
+
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-for-of-statement/_expected/es.js b/test/form/empty-for-of-statement/_expected/es.js
new file mode 100644
index 0000000..f97f3d0
--- /dev/null
+++ b/test/form/empty-for-of-statement/_expected/es.js
@@ -0,0 +1,2 @@
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-for-of-statement/_expected/iife.js b/test/form/empty-for-of-statement/_expected/iife.js
new file mode 100644
index 0000000..39aedbf
--- /dev/null
+++ b/test/form/empty-for-of-statement/_expected/iife.js
@@ -0,0 +1,7 @@
+(function () {
+	'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+}());
\ No newline at end of file
diff --git a/test/form/empty-for-of-statement/_expected/umd.js b/test/form/empty-for-of-statement/_expected/umd.js
new file mode 100644
index 0000000..0445193
--- /dev/null
+++ b/test/form/empty-for-of-statement/_expected/umd.js
@@ -0,0 +1,10 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+})));
\ No newline at end of file
diff --git a/test/form/empty-for-of-statement/main.js b/test/form/empty-for-of-statement/main.js
new file mode 100644
index 0000000..e591dde
--- /dev/null
+++ b/test/form/empty-for-of-statement/main.js
@@ -0,0 +1,5 @@
+console.log( 1 );
+for ( const i of whatever ) {
+	// do nothing
+}
+console.log( 2 );
diff --git a/test/form/empty-for-statement/_config.js b/test/form/empty-for-statement/_config.js
new file mode 100644
index 0000000..f448ddf
--- /dev/null
+++ b/test/form/empty-for-statement/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'removes an empty for statement'
+};
diff --git a/test/form/empty-for-statement/_expected/amd.js b/test/form/empty-for-statement/_expected/amd.js
new file mode 100644
index 0000000..6036f28
--- /dev/null
+++ b/test/form/empty-for-statement/_expected/amd.js
@@ -0,0 +1,6 @@
+define(function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+});
diff --git a/test/form/empty-for-statement/_expected/cjs.js b/test/form/empty-for-statement/_expected/cjs.js
new file mode 100644
index 0000000..33f9de0
--- /dev/null
+++ b/test/form/empty-for-statement/_expected/cjs.js
@@ -0,0 +1,4 @@
+'use strict';
+
+console.log( 1 );
+console.log( 2 );
diff --git a/test/form/empty-for-statement/_expected/es.js b/test/form/empty-for-statement/_expected/es.js
new file mode 100644
index 0000000..472e544
--- /dev/null
+++ b/test/form/empty-for-statement/_expected/es.js
@@ -0,0 +1,2 @@
+console.log( 1 );
+console.log( 2 );
diff --git a/test/form/empty-for-statement/_expected/iife.js b/test/form/empty-for-statement/_expected/iife.js
new file mode 100644
index 0000000..08a84a9
--- /dev/null
+++ b/test/form/empty-for-statement/_expected/iife.js
@@ -0,0 +1,7 @@
+(function () {
+	'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+}());
diff --git a/test/form/empty-for-statement/_expected/umd.js b/test/form/empty-for-statement/_expected/umd.js
new file mode 100644
index 0000000..0aae43f
--- /dev/null
+++ b/test/form/empty-for-statement/_expected/umd.js
@@ -0,0 +1,10 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+})));
diff --git a/test/form/empty-for-statement/main.js b/test/form/empty-for-statement/main.js
new file mode 100644
index 0000000..3b5d176
--- /dev/null
+++ b/test/form/empty-for-statement/main.js
@@ -0,0 +1,5 @@
+console.log( 1 );
+for ( let i = 0; i < 10; i += 1 ) {
+	// do nothing
+}
+console.log( 2 );
diff --git a/test/form/empty-if-statement/_config.js b/test/form/empty-if-statement/_config.js
new file mode 100644
index 0000000..abea889
--- /dev/null
+++ b/test/form/empty-if-statement/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'removes an empty if statement'
+};
diff --git a/test/form/empty-if-statement/_expected/amd.js b/test/form/empty-if-statement/_expected/amd.js
new file mode 100644
index 0000000..e44e556
--- /dev/null
+++ b/test/form/empty-if-statement/_expected/amd.js
@@ -0,0 +1,6 @@
+define(function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+});
\ No newline at end of file
diff --git a/test/form/empty-if-statement/_expected/cjs.js b/test/form/empty-if-statement/_expected/cjs.js
new file mode 100644
index 0000000..1afb143
--- /dev/null
+++ b/test/form/empty-if-statement/_expected/cjs.js
@@ -0,0 +1,4 @@
+'use strict';
+
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-if-statement/_expected/es.js b/test/form/empty-if-statement/_expected/es.js
new file mode 100644
index 0000000..f97f3d0
--- /dev/null
+++ b/test/form/empty-if-statement/_expected/es.js
@@ -0,0 +1,2 @@
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-if-statement/_expected/iife.js b/test/form/empty-if-statement/_expected/iife.js
new file mode 100644
index 0000000..39aedbf
--- /dev/null
+++ b/test/form/empty-if-statement/_expected/iife.js
@@ -0,0 +1,7 @@
+(function () {
+	'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+}());
\ No newline at end of file
diff --git a/test/form/empty-if-statement/_expected/umd.js b/test/form/empty-if-statement/_expected/umd.js
new file mode 100644
index 0000000..0445193
--- /dev/null
+++ b/test/form/empty-if-statement/_expected/umd.js
@@ -0,0 +1,10 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+})));
\ No newline at end of file
diff --git a/test/form/empty-if-statement/main.js b/test/form/empty-if-statement/main.js
new file mode 100644
index 0000000..6db9dc1
--- /dev/null
+++ b/test/form/empty-if-statement/main.js
@@ -0,0 +1,5 @@
+console.log( 1 );
+if ( nothing ) {
+	// empty
+}
+console.log( 2 );
diff --git a/test/form/empty-statement/_config.js b/test/form/empty-statement/_config.js
new file mode 100644
index 0000000..76e4fa3
--- /dev/null
+++ b/test/form/empty-statement/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'removes an empty statement'
+};
diff --git a/test/form/empty-statement/_expected/amd.js b/test/form/empty-statement/_expected/amd.js
new file mode 100644
index 0000000..d7ee383
--- /dev/null
+++ b/test/form/empty-statement/_expected/amd.js
@@ -0,0 +1,7 @@
+define(function () { 'use strict';
+
+	console.log( 1 );
+
+	console.log( 2 );
+
+});
diff --git a/test/form/empty-statement/_expected/cjs.js b/test/form/empty-statement/_expected/cjs.js
new file mode 100644
index 0000000..2ad8cd2
--- /dev/null
+++ b/test/form/empty-statement/_expected/cjs.js
@@ -0,0 +1,5 @@
+'use strict';
+
+console.log( 1 );
+
+console.log( 2 );
diff --git a/test/form/empty-statement/_expected/es.js b/test/form/empty-statement/_expected/es.js
new file mode 100644
index 0000000..b149085
--- /dev/null
+++ b/test/form/empty-statement/_expected/es.js
@@ -0,0 +1,3 @@
+console.log( 1 );
+
+console.log( 2 );
diff --git a/test/form/empty-statement/_expected/iife.js b/test/form/empty-statement/_expected/iife.js
new file mode 100644
index 0000000..c9dbff5
--- /dev/null
+++ b/test/form/empty-statement/_expected/iife.js
@@ -0,0 +1,8 @@
+(function () {
+	'use strict';
+
+	console.log( 1 );
+
+	console.log( 2 );
+
+}());
diff --git a/test/form/empty-statement/_expected/umd.js b/test/form/empty-statement/_expected/umd.js
new file mode 100644
index 0000000..e97ebff
--- /dev/null
+++ b/test/form/empty-statement/_expected/umd.js
@@ -0,0 +1,11 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+	console.log( 1 );
+
+	console.log( 2 );
+
+})));
diff --git a/test/form/empty-statement/main.js b/test/form/empty-statement/main.js
new file mode 100644
index 0000000..43f7037
--- /dev/null
+++ b/test/form/empty-statement/main.js
@@ -0,0 +1,4 @@
+;
+console.log( 1 );;
+;
+console.log( 2 );;
diff --git a/test/form/empty-switch-statement/_config.js b/test/form/empty-switch-statement/_config.js
new file mode 100644
index 0000000..29c0517
--- /dev/null
+++ b/test/form/empty-switch-statement/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'removes an empty switch statement'
+};
diff --git a/test/form/empty-switch-statement/_expected/amd.js b/test/form/empty-switch-statement/_expected/amd.js
new file mode 100644
index 0000000..e44e556
--- /dev/null
+++ b/test/form/empty-switch-statement/_expected/amd.js
@@ -0,0 +1,6 @@
+define(function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+});
\ No newline at end of file
diff --git a/test/form/empty-switch-statement/_expected/cjs.js b/test/form/empty-switch-statement/_expected/cjs.js
new file mode 100644
index 0000000..1afb143
--- /dev/null
+++ b/test/form/empty-switch-statement/_expected/cjs.js
@@ -0,0 +1,4 @@
+'use strict';
+
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-switch-statement/_expected/es.js b/test/form/empty-switch-statement/_expected/es.js
new file mode 100644
index 0000000..f97f3d0
--- /dev/null
+++ b/test/form/empty-switch-statement/_expected/es.js
@@ -0,0 +1,2 @@
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-switch-statement/_expected/iife.js b/test/form/empty-switch-statement/_expected/iife.js
new file mode 100644
index 0000000..39aedbf
--- /dev/null
+++ b/test/form/empty-switch-statement/_expected/iife.js
@@ -0,0 +1,7 @@
+(function () {
+	'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+}());
\ No newline at end of file
diff --git a/test/form/empty-switch-statement/_expected/umd.js b/test/form/empty-switch-statement/_expected/umd.js
new file mode 100644
index 0000000..0445193
--- /dev/null
+++ b/test/form/empty-switch-statement/_expected/umd.js
@@ -0,0 +1,10 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+})));
\ No newline at end of file
diff --git a/test/form/empty-switch-statement/main.js b/test/form/empty-switch-statement/main.js
new file mode 100644
index 0000000..58da4d4
--- /dev/null
+++ b/test/form/empty-switch-statement/main.js
@@ -0,0 +1,11 @@
+console.log( 1 );
+var result;
+switch ( whatever ) {
+	case foo:
+		result = 'foo';
+		break;
+
+	default:
+		result = 'default';
+}
+console.log( 2 );
diff --git a/test/form/empty-try-catch-statement/_config.js b/test/form/empty-try-catch-statement/_config.js
new file mode 100644
index 0000000..70bf652
--- /dev/null
+++ b/test/form/empty-try-catch-statement/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'removes an empty try-catch-finally statement'
+};
diff --git a/test/form/empty-try-catch-statement/_expected/amd.js b/test/form/empty-try-catch-statement/_expected/amd.js
new file mode 100644
index 0000000..e44e556
--- /dev/null
+++ b/test/form/empty-try-catch-statement/_expected/amd.js
@@ -0,0 +1,6 @@
+define(function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+});
\ No newline at end of file
diff --git a/test/form/empty-try-catch-statement/_expected/cjs.js b/test/form/empty-try-catch-statement/_expected/cjs.js
new file mode 100644
index 0000000..1afb143
--- /dev/null
+++ b/test/form/empty-try-catch-statement/_expected/cjs.js
@@ -0,0 +1,4 @@
+'use strict';
+
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-try-catch-statement/_expected/es.js b/test/form/empty-try-catch-statement/_expected/es.js
new file mode 100644
index 0000000..f97f3d0
--- /dev/null
+++ b/test/form/empty-try-catch-statement/_expected/es.js
@@ -0,0 +1,2 @@
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-try-catch-statement/_expected/iife.js b/test/form/empty-try-catch-statement/_expected/iife.js
new file mode 100644
index 0000000..39aedbf
--- /dev/null
+++ b/test/form/empty-try-catch-statement/_expected/iife.js
@@ -0,0 +1,7 @@
+(function () {
+	'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+}());
\ No newline at end of file
diff --git a/test/form/empty-try-catch-statement/_expected/umd.js b/test/form/empty-try-catch-statement/_expected/umd.js
new file mode 100644
index 0000000..0445193
--- /dev/null
+++ b/test/form/empty-try-catch-statement/_expected/umd.js
@@ -0,0 +1,10 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+})));
\ No newline at end of file
diff --git a/test/form/empty-try-catch-statement/main.js b/test/form/empty-try-catch-statement/main.js
new file mode 100644
index 0000000..52ed8c1
--- /dev/null
+++ b/test/form/empty-try-catch-statement/main.js
@@ -0,0 +1,9 @@
+console.log( 1 );
+try {
+	// do nothing
+} catch ( err ) {
+	// do nothing
+} finally {
+	// do nothing
+}
+console.log( 2 );
diff --git a/test/form/empty-while-statement/_config.js b/test/form/empty-while-statement/_config.js
new file mode 100644
index 0000000..8db2e7f
--- /dev/null
+++ b/test/form/empty-while-statement/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'removes an empty while statement'
+};
diff --git a/test/form/empty-while-statement/_expected/amd.js b/test/form/empty-while-statement/_expected/amd.js
new file mode 100644
index 0000000..e44e556
--- /dev/null
+++ b/test/form/empty-while-statement/_expected/amd.js
@@ -0,0 +1,6 @@
+define(function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+});
\ No newline at end of file
diff --git a/test/form/empty-while-statement/_expected/cjs.js b/test/form/empty-while-statement/_expected/cjs.js
new file mode 100644
index 0000000..1afb143
--- /dev/null
+++ b/test/form/empty-while-statement/_expected/cjs.js
@@ -0,0 +1,4 @@
+'use strict';
+
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-while-statement/_expected/es.js b/test/form/empty-while-statement/_expected/es.js
new file mode 100644
index 0000000..f97f3d0
--- /dev/null
+++ b/test/form/empty-while-statement/_expected/es.js
@@ -0,0 +1,2 @@
+console.log( 1 );
+console.log( 2 );
\ No newline at end of file
diff --git a/test/form/empty-while-statement/_expected/iife.js b/test/form/empty-while-statement/_expected/iife.js
new file mode 100644
index 0000000..39aedbf
--- /dev/null
+++ b/test/form/empty-while-statement/_expected/iife.js
@@ -0,0 +1,7 @@
+(function () {
+	'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+}());
\ No newline at end of file
diff --git a/test/form/empty-while-statement/_expected/umd.js b/test/form/empty-while-statement/_expected/umd.js
new file mode 100644
index 0000000..0445193
--- /dev/null
+++ b/test/form/empty-while-statement/_expected/umd.js
@@ -0,0 +1,10 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+	console.log( 1 );
+	console.log( 2 );
+
+})));
\ No newline at end of file
diff --git a/test/form/empty-while-statement/main.js b/test/form/empty-while-statement/main.js
new file mode 100644
index 0000000..c499a7f
--- /dev/null
+++ b/test/form/empty-while-statement/main.js
@@ -0,0 +1,6 @@
+console.log( 1 );
+var condition = true;
+while ( condition ) {
+	condition = false;
+}
+console.log( 2 );
diff --git a/test/form/erroneous-nested-member-expression/_expected/amd.js b/test/form/erroneous-nested-member-expression/_expected/amd.js
index 6499b90..4b402c7 100644
--- a/test/form/erroneous-nested-member-expression/_expected/amd.js
+++ b/test/form/erroneous-nested-member-expression/_expected/amd.js
@@ -6,8 +6,8 @@ define(function () { 'use strict';
 				console.log('har?');
 			}
 		};
-	};
+	}
 
 	yar.har();
 
-});
\ No newline at end of file
+});
diff --git a/test/form/erroneous-nested-member-expression/_expected/cjs.js b/test/form/erroneous-nested-member-expression/_expected/cjs.js
index aa4b949..01c96f9 100644
--- a/test/form/erroneous-nested-member-expression/_expected/cjs.js
+++ b/test/form/erroneous-nested-member-expression/_expected/cjs.js
@@ -6,6 +6,6 @@ function yar() {
 			console.log('har?');
 		}
 	};
-};
+}
 
-yar.har();
\ No newline at end of file
+yar.har();
diff --git a/test/form/erroneous-nested-member-expression/_expected/es.js b/test/form/erroneous-nested-member-expression/_expected/es.js
index 34c4e2e..ee4eace 100644
--- a/test/form/erroneous-nested-member-expression/_expected/es.js
+++ b/test/form/erroneous-nested-member-expression/_expected/es.js
@@ -4,6 +4,6 @@ function yar() {
 			console.log('har?');
 		}
 	};
-};
+}
 
-yar.har();
\ No newline at end of file
+yar.har();
diff --git a/test/form/erroneous-nested-member-expression/_expected/iife.js b/test/form/erroneous-nested-member-expression/_expected/iife.js
index 4233cfe..8a8d65e 100644
--- a/test/form/erroneous-nested-member-expression/_expected/iife.js
+++ b/test/form/erroneous-nested-member-expression/_expected/iife.js
@@ -7,8 +7,8 @@
 				console.log('har?');
 			}
 		};
-	};
+	}
 
 	yar.har();
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/erroneous-nested-member-expression/_expected/umd.js b/test/form/erroneous-nested-member-expression/_expected/umd.js
index 2a8dba1..94dee16 100644
--- a/test/form/erroneous-nested-member-expression/_expected/umd.js
+++ b/test/form/erroneous-nested-member-expression/_expected/umd.js
@@ -10,8 +10,8 @@
 				console.log('har?');
 			}
 		};
-	};
+	}
 
 	yar.har();
 
-})));
\ No newline at end of file
+})));
diff --git a/test/form/spacing-after-function-with-semicolon/_expected/amd.js b/test/form/spacing-after-function-with-semicolon/_expected/amd.js
index 37f42f3..4db965c 100644
--- a/test/form/spacing-after-function-with-semicolon/_expected/amd.js
+++ b/test/form/spacing-after-function-with-semicolon/_expected/amd.js
@@ -1,6 +1,6 @@
 define(function () { 'use strict';
 
-	function x () { return 'x' };
+	function x () { return 'x' }
 
 	assert.equal( x(), 'x' );
 
diff --git a/test/form/spacing-after-function-with-semicolon/_expected/cjs.js b/test/form/spacing-after-function-with-semicolon/_expected/cjs.js
index 503ea73..bac28c1 100644
--- a/test/form/spacing-after-function-with-semicolon/_expected/cjs.js
+++ b/test/form/spacing-after-function-with-semicolon/_expected/cjs.js
@@ -1,5 +1,5 @@
 'use strict';
 
-function x () { return 'x' };
+function x () { return 'x' }
 
 assert.equal( x(), 'x' );
diff --git a/test/form/spacing-after-function-with-semicolon/_expected/es.js b/test/form/spacing-after-function-with-semicolon/_expected/es.js
index 3b3f5e7..f5b5029 100644
--- a/test/form/spacing-after-function-with-semicolon/_expected/es.js
+++ b/test/form/spacing-after-function-with-semicolon/_expected/es.js
@@ -1,3 +1,3 @@
-function x () { return 'x' };
+function x () { return 'x' }
 
 assert.equal( x(), 'x' );
diff --git a/test/form/spacing-after-function-with-semicolon/_expected/iife.js b/test/form/spacing-after-function-with-semicolon/_expected/iife.js
index 7ff78ec..f8d6992 100644
--- a/test/form/spacing-after-function-with-semicolon/_expected/iife.js
+++ b/test/form/spacing-after-function-with-semicolon/_expected/iife.js
@@ -1,7 +1,7 @@
 (function () {
 	'use strict';
 
-	function x () { return 'x' };
+	function x () { return 'x' }
 
 	assert.equal( x(), 'x' );
 
diff --git a/test/form/spacing-after-function-with-semicolon/_expected/umd.js b/test/form/spacing-after-function-with-semicolon/_expected/umd.js
index 8b7954a..75d31a1 100644
--- a/test/form/spacing-after-function-with-semicolon/_expected/umd.js
+++ b/test/form/spacing-after-function-with-semicolon/_expected/umd.js
@@ -4,8 +4,8 @@
 	(factory());
 }(this, (function () { 'use strict';
 
-	function x () { return 'x' };
+	function x () { return 'x' }
 
 	assert.equal( x(), 'x' );
 
-})));
\ No newline at end of file
+})));