diff --git a/src/finalisers/umd.js b/src/finalisers/umd.js
index 9b482be..d2f01db 100644
--- a/src/finalisers/umd.js
+++ b/src/finalisers/umd.js
@@ -40,7 +40,7 @@ export default function umd ( bundle, magicString, { exportMode, indentString },
 			typeof exports === 'object' && typeof module !== 'undefined' ? ${cjsExport}factory(${cjsDeps.join( ', ' )}) :
 			typeof define === 'function' && define.amd ? define(${amdParams}factory) :
 			${defaultExport}factory(${globalDeps});
-		}(this || (typeof window !== 'undefined' && window), function (${args}) {${useStrict}
+		}(this, function (${args}) {${useStrict}
 
 		`.replace( /^\t\t/gm, '' ).replace( /^\t/gm, magicString.getIndentString() );
 
diff --git a/test/cli/module-name/_expected.js b/test/cli/module-name/_expected.js
index 6655774..b5aa08a 100644
--- a/test/cli/module-name/_expected.js
+++ b/test/cli/module-name/_expected.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	global.myBundle = factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	var main = 42;
 
diff --git a/test/form/banner-and-footer/_expected/umd.js b/test/form/banner-and-footer/_expected/umd.js
index 711f09f..74dd673 100644
--- a/test/form/banner-and-footer/_expected/umd.js
+++ b/test/form/banner-and-footer/_expected/umd.js
@@ -3,7 +3,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	console.log( 'hello world' );
 
diff --git a/test/form/block-comments/_expected/umd.js b/test/form/block-comments/_expected/umd.js
index b7147bc..e61b314 100644
--- a/test/form/block-comments/_expected/umd.js
+++ b/test/form/block-comments/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	function foo () {
 		return embiggen( 6, 7 );
diff --git a/test/form/dedupes-external-imports/_expected/umd.js b/test/form/dedupes-external-imports/_expected/umd.js
index 2da127c..49ca55a 100644
--- a/test/form/dedupes-external-imports/_expected/umd.js
+++ b/test/form/dedupes-external-imports/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('external')) :
 	typeof define === 'function' && define.amd ? define(['external'], factory) :
 	factory(global.external);
-}(this || (typeof window !== 'undefined' && window), function (external) { 'use strict';
+}(this, function (external) { 'use strict';
 
 	class Foo extends external.Component {
 		constructor () {
diff --git a/test/form/exclude-unnecessary-modifications/_expected/umd.js b/test/form/exclude-unnecessary-modifications/_expected/umd.js
index 44450c7..1c2bb78 100644
--- a/test/form/exclude-unnecessary-modifications/_expected/umd.js
+++ b/test/form/exclude-unnecessary-modifications/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	var foo = {};
 
diff --git a/test/form/export-all-from-internal/_expected/umd.js b/test/form/export-all-from-internal/_expected/umd.js
index dcd9bf5..45a93fa 100644
--- a/test/form/export-all-from-internal/_expected/umd.js
+++ b/test/form/export-all-from-internal/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
 	factory((global.exposedInternals = {}));
-}(this || (typeof window !== 'undefined' && window), function (exports) { 'use strict';
+}(this, function (exports) { 'use strict';
 
 	const a = 1;
 	const b = 2;
diff --git a/test/form/export-default/_expected/umd.js b/test/form/export-default/_expected/umd.js
index 6655774..b5aa08a 100644
--- a/test/form/export-default/_expected/umd.js
+++ b/test/form/export-default/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	global.myBundle = factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	var main = 42;
 
diff --git a/test/form/exports-at-end-if-possible/_expected/umd.js b/test/form/exports-at-end-if-possible/_expected/umd.js
index 00c5cae..f30f365 100644
--- a/test/form/exports-at-end-if-possible/_expected/umd.js
+++ b/test/form/exports-at-end-if-possible/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
 	factory((global.myBundle = {}));
-}(this || (typeof window !== 'undefined' && window), function (exports) { 'use strict';
+}(this, function (exports) { 'use strict';
 
 	var FOO = 'foo';
 
diff --git a/test/form/external-imports-custom-names/_expected/umd.js b/test/form/external-imports-custom-names/_expected/umd.js
index a3d2574..8912390 100644
--- a/test/form/external-imports-custom-names/_expected/umd.js
+++ b/test/form/external-imports-custom-names/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
 	typeof define === 'function' && define.amd ? define(['jquery'], factory) :
 	factory(global.jQuery);
-}(this || (typeof window !== 'undefined' && window), function ($) { 'use strict';
+}(this, function ($) { 'use strict';
 
 	$ = 'default' in $ ? $['default'] : $;
 
diff --git a/test/form/external-imports/_expected/umd.js b/test/form/external-imports/_expected/umd.js
index 372e59b..196c394 100644
--- a/test/form/external-imports/_expected/umd.js
+++ b/test/form/external-imports/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('factory'), require('baz'), require('shipping-port'), require('alphabet')) :
 	typeof define === 'function' && define.amd ? define(['factory', 'baz', 'shipping-port', 'alphabet'], factory) :
 	factory(global.factory,global.baz,global.containers,global.alphabet);
-}(this || (typeof window !== 'undefined' && window), function (factory,baz,containers,alphabet) { 'use strict';
+}(this, function (factory,baz,containers,alphabet) { 'use strict';
 
 	factory = 'default' in factory ? factory['default'] : factory;
 	var alphabet__default = 'default' in alphabet ? alphabet['default'] : alphabet;
diff --git a/test/form/indent-false/_expected/umd.js b/test/form/indent-false/_expected/umd.js
index 00c751c..ad094b9 100644
--- a/test/form/indent-false/_expected/umd.js
+++ b/test/form/indent-false/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	global.foo = factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 function foo () {
 	console.log( 'indented with tabs' );
diff --git a/test/form/indent-true-spaces/_expected/umd.js b/test/form/indent-true-spaces/_expected/umd.js
index 3f7e175..ecbc24d 100644
--- a/test/form/indent-true-spaces/_expected/umd.js
+++ b/test/form/indent-true-spaces/_expected/umd.js
@@ -2,7 +2,7 @@
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
   global.foo = factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
   function foo () {
     console.log( 'indented with spaces' );
diff --git a/test/form/indent-true/_expected/umd.js b/test/form/indent-true/_expected/umd.js
index 9e18cd5..e06c50d 100644
--- a/test/form/indent-true/_expected/umd.js
+++ b/test/form/indent-true/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	global.foo = factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	function foo () {
 		console.log( 'indented with tabs' );
diff --git a/test/form/internal-conflict-resolution/_expected/umd.js b/test/form/internal-conflict-resolution/_expected/umd.js
index ec20f2f..d9d801b 100644
--- a/test/form/internal-conflict-resolution/_expected/umd.js
+++ b/test/form/internal-conflict-resolution/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	var bar = 42;
 
diff --git a/test/form/multiple-exports/_expected/umd.js b/test/form/multiple-exports/_expected/umd.js
index 5219e44..687b75c 100644
--- a/test/form/multiple-exports/_expected/umd.js
+++ b/test/form/multiple-exports/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
 	factory((global.myBundle = {}));
-}(this || (typeof window !== 'undefined' && window), function (exports) { 'use strict';
+}(this, function (exports) { 'use strict';
 
 	var foo = 1;
 	var bar = 2;
diff --git a/test/form/namespace-optimization/_expected/umd.js b/test/form/namespace-optimization/_expected/umd.js
index da3e7ad..38f7835 100644
--- a/test/form/namespace-optimization/_expected/umd.js
+++ b/test/form/namespace-optimization/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	function a () {}
 
diff --git a/test/form/no-imports-or-exports/_expected/umd.js b/test/form/no-imports-or-exports/_expected/umd.js
index 68b6ed0..37794fa 100644
--- a/test/form/no-imports-or-exports/_expected/umd.js
+++ b/test/form/no-imports-or-exports/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	console.log( 'this is it' );
 
diff --git a/test/form/preserves-comments-after-imports/_expected/umd.js b/test/form/preserves-comments-after-imports/_expected/umd.js
index c581d06..96fec25 100644
--- a/test/form/preserves-comments-after-imports/_expected/umd.js
+++ b/test/form/preserves-comments-after-imports/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
 	factory((global.myBundle = {}));
-}(this || (typeof window !== 'undefined' && window), function (exports) { 'use strict';
+}(this, function (exports) { 'use strict';
 
 	/** A comment for a number */
 	var number = 5;
diff --git a/test/form/removes-existing-sourcemap-comments/_expected/umd.js b/test/form/removes-existing-sourcemap-comments/_expected/umd.js
index 5f960f0..79f644c 100644
--- a/test/form/removes-existing-sourcemap-comments/_expected/umd.js
+++ b/test/form/removes-existing-sourcemap-comments/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	function foo () {
 		return 42;
diff --git a/test/form/self-contained-bundle/_expected/umd.js b/test/form/self-contained-bundle/_expected/umd.js
index dcb5071..51b72b0 100644
--- a/test/form/self-contained-bundle/_expected/umd.js
+++ b/test/form/self-contained-bundle/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	function foo () {
 		return bar();
diff --git a/test/form/sourcemaps-inline/_expected/umd.js b/test/form/sourcemaps-inline/_expected/umd.js
index c082073..a63cd7a 100644
--- a/test/form/sourcemaps-inline/_expected/umd.js
+++ b/test/form/sourcemaps-inline/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	function foo () {
 		console.log( 'hello from foo.js' );
diff --git a/test/form/sourcemaps/_expected/umd.js b/test/form/sourcemaps/_expected/umd.js
index b1fdc01..21b30a3 100644
--- a/test/form/sourcemaps/_expected/umd.js
+++ b/test/form/sourcemaps/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	function foo () {
 		console.log( 'hello from foo.js' );
diff --git a/test/form/unmodified-default-exports-function-argument/_expected/umd.js b/test/form/unmodified-default-exports-function-argument/_expected/umd.js
index 32f54aa..5ae4301 100644
--- a/test/form/unmodified-default-exports-function-argument/_expected/umd.js
+++ b/test/form/unmodified-default-exports-function-argument/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	var foo = function () {
 		return 42;
diff --git a/test/form/unmodified-default-exports/_expected/umd.js b/test/form/unmodified-default-exports/_expected/umd.js
index a5ae3bf..63cf07d 100644
--- a/test/form/unmodified-default-exports/_expected/umd.js
+++ b/test/form/unmodified-default-exports/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	var Foo = function () {
 		this.isFoo = true;
diff --git a/test/form/unused-default-exports/_expected/umd.js b/test/form/unused-default-exports/_expected/umd.js
index ddc2f2a..140a92b 100644
--- a/test/form/unused-default-exports/_expected/umd.js
+++ b/test/form/unused-default-exports/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	var foo = { value: 1 };
 
diff --git a/test/form/unused-side-effect/_expected/umd.js b/test/form/unused-side-effect/_expected/umd.js
index 0eacecf..f96fd30 100644
--- a/test/form/unused-side-effect/_expected/umd.js
+++ b/test/form/unused-side-effect/_expected/umd.js
@@ -2,7 +2,7 @@
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
 	factory();
-}(this || (typeof window !== 'undefined' && window), function () { 'use strict';
+}(this, function () { 'use strict';
 
 	var foo = 42;