diff --git a/src/finalisers/iife.ts b/src/finalisers/iife.ts
index 60d477e24d5..37318815709 100644
--- a/src/finalisers/iife.ts
+++ b/src/finalisers/iife.ts
@@ -54,7 +54,7 @@ export default function iife(
 	}
 
 	if (extend) {
-		deps.unshift(`(${thisProp(name)}${_}=${_}${thisProp(name)}${_}||${_}{})`);
+		deps.unshift(`${thisProp(name)}${_}=${_}${thisProp(name)}${_}||${_}{}`);
 		args.unshift('exports');
 	} else if (namedExportsMode && hasExports) {
 		deps.unshift('{}');
diff --git a/src/finalisers/umd.ts b/src/finalisers/umd.ts
index 92b1834ce29..60184484b71 100644
--- a/src/finalisers/umd.ts
+++ b/src/finalisers/umd.ts
@@ -39,8 +39,6 @@ export default function umd(
 	const _ = options.compact ? '' : ' ';
 	const n = options.compact ? '' : '\n';
 
-	const wrapperOutro = n + n + '})));';
-
 	if (hasExports && !options.name) {
 		error({
 			code: 'INVALID_OPTION',
@@ -53,20 +51,20 @@ export default function umd(
 	const amdDeps = dependencies.map(m => `'${m.id}'`);
 	const cjsDeps = dependencies.map(m => `require('${m.id}')`);
 
-	const trimmed = trimEmptyImports(dependencies);
-	const globalDeps = trimmed.map(module => globalProp(module.globalName));
-	const args = trimmed.map(m => m.name);
+	const trimmedImports = trimEmptyImports(dependencies);
+	const globalDeps = trimmedImports.map(module => globalProp(module.globalName));
+	const factoryArgs = trimmedImports.map(m => m.name);
 
-	if (namedExportsMode && hasExports) {
+	if (namedExportsMode && (hasExports || options.noConflict === true)) {
 		amdDeps.unshift(`'exports'`);
 		cjsDeps.unshift(`exports`);
 		globalDeps.unshift(
-			`(${setupNamespace(options.name, 'global', true, options.globals, options.compact)}${_}=${_}${
+			`${setupNamespace(options.name, 'global', true, options.globals, options.compact)}${_}=${_}${
 				options.extend ? `${globalProp(options.name)}${_}||${_}` : ''
-			}{})`
+			}{}`
 		);
 
-		args.unshift('exports');
+		factoryArgs.unshift('exports');
 	}
 
 	const amdOptions = options.amd || {};
@@ -94,28 +92,42 @@ export default function umd(
 			factory = `var exports${_}=${_}factory(${globalDeps});`;
 		} else if (namedExportsMode) {
 			const module = globalDeps.shift();
-			factory = `var exports${_}=${_}${module};${n}`;
-			factory += `${t}${t}factory(${['exports'].concat(globalDeps)});`;
+			factory =
+				`var exports${_}=${_}${module};${n}` +
+				`${t}${t}factory(${['exports'].concat(globalDeps)});`;
 		}
-		globalExport = `(function()${_}{${n}`;
-		globalExport += `${t}${t}var current${_}=${_}${safeAccess(options.name, options.compact)};${n}`;
-		globalExport += `${t}${t}${factory}${n}`;
-		globalExport += `${t}${t}${globalProp(options.name)}${_}=${_}exports;${n}`;
-		globalExport += `${t}${t}exports.noConflict${_}=${_}function()${_}{${_}`;
-		globalExport += `${globalProp(options.name)}${_}=${_}current;${_}return exports${
-			options.compact ? '' : '; '
-		}};${n}`;
-		globalExport += `${t}})()`;
+		globalExport =
+			`(function()${_}{${n}` +
+			`${t}${t}var current${_}=${_}${safeAccess(options.name, options.compact)};${n}` +
+			`${t}${t}${factory}${n}` +
+			`${t}${t}${globalProp(options.name)}${_}=${_}exports;${n}` +
+			`${t}${t}exports.noConflict${_}=${_}function()${_}{${_}` +
+			`${globalProp(options.name)}${_}=${_}current;${_}return exports${
+				options.compact ? '' : '; '
+			}};${n}` +
+			`${t}})()`;
 	} else {
-		globalExport = `(${defaultExport}factory(${globalDeps}))`;
+		globalExport = `${defaultExport}factory(${globalDeps})`;
 	}
 
-	let wrapperIntro = `(function${_}(global,${_}factory)${_}{${n}`;
-	wrapperIntro += `${t}typeof exports${_}===${_}'object'${_}&&${_}typeof module${_}!==${_}'undefined'${_}?`;
-	wrapperIntro += `${_}${cjsExport}factory(${cjsDeps.join(`,${_}`)})${_}:${n}`;
-	wrapperIntro += `${t}typeof ${define}${_}===${_}'function'${_}&&${_}${define}.amd${_}?${_}${define}(${amdParams}factory)${_}:${n}`;
-	wrapperIntro += `${t}${globalExport};${n}`;
-	wrapperIntro += `}(this,${_}(function${_}(${args})${_}{${useStrict}${n}`;
+	const iifeNeedsGlobal = hasExports || (options.noConflict === true && namedExportsMode);
+	const globalParam = iifeNeedsGlobal ? `global,${_}` : '';
+	const globalArg = iifeNeedsGlobal
+		? `typeof self${_}!==${_}'undefined'${_}?${_}self${_}:${_}this,${_}`
+		: '';
+	const cjsIntro = iifeNeedsGlobal
+		? `${t}typeof exports${_}===${_}'object'${_}&&${_}typeof module${_}!==${_}'undefined'${_}?` +
+		  `${_}${cjsExport}factory(${cjsDeps.join(`,${_}`)})${_}:${n}`
+		: '';
+
+	const wrapperIntro =
+		`(function${_}(${globalParam}factory)${_}{${n}` +
+		cjsIntro +
+		`${t}typeof ${define}${_}===${_}'function'${_}&&${_}${define}.amd${_}?${_}${define}(${amdParams}factory)${_}:${n}` +
+		`${t}${globalExport};${n}` +
+		`}(${globalArg}function${_}(${factoryArgs})${_}{${useStrict}${n}`;
+
+	const wrapperOutro = n + n + '}));';
 
 	// var foo__default = 'default' in foo ? foo['default'] : foo;
 	const interopBlock = getInteropBlock(dependencies, options, graph.varOrConst);
diff --git a/test/cli/samples/indent-none/_expected.js b/test/cli/samples/indent-none/_expected.js
index 74b5c2e3420..4c9c9e495a8 100644
--- a/test/cli/samples/indent-none/_expected.js
+++ b/test/cli/samples/indent-none/_expected.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 typeof define === 'function' && define.amd ? define(factory) :
-(factory());
-}(this, (function () { 'use strict';
+factory();
+}(function () { 'use strict';
 
 assert.equal( 1 + 1, 2 );
 
-})));
+}));
diff --git a/test/cli/samples/module-name/_expected.js b/test/cli/samples/module-name/_expected.js
index 2f715871718..5d988c0df7c 100644
--- a/test/cli/samples/module-name/_expected.js
+++ b/test/cli/samples/module-name/_expected.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-})));
+}));
diff --git a/test/cli/samples/no-conflict/_expected.js b/test/cli/samples/no-conflict/_expected.js
index 368a23db083..50291cbf6e7 100644
--- a/test/cli/samples/no-conflict/_expected.js
+++ b/test/cli/samples/no-conflict/_expected.js
@@ -7,10 +7,10 @@
 		global.conflictyName = exports;
 		exports.noConflict = function() { global.conflictyName = current; return exports; };
 	})();
-}(this, (function () { 'use strict';
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var main = {};
 
 	return main;
 
-})));
+}));
diff --git a/test/form/samples/absolute-path-resolver/_expected/iife.js b/test/form/samples/absolute-path-resolver/_expected/iife.js
index cb9df4a40c8..46c38fba33b 100644
--- a/test/form/samples/absolute-path-resolver/_expected/iife.js
+++ b/test/form/samples/absolute-path-resolver/_expected/iife.js
@@ -8,4 +8,4 @@
     a();
     a();
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/absolute-path-resolver/_expected/umd.js b/test/form/samples/absolute-path-resolver/_expected/umd.js
index 611df0c41da..636759fa2a8 100644
--- a/test/form/samples/absolute-path-resolver/_expected/umd.js
+++ b/test/form/samples/absolute-path-resolver/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
     typeof define === 'function' && define.amd ? define(factory) :
-    (factory());
-}(this, (function () { 'use strict';
+    factory();
+}(function () { 'use strict';
 
     var a = () => {
         console.log('props');
@@ -11,4 +10,4 @@
     a();
     a();
 
-})));
+}));
diff --git a/test/form/samples/arrow-function-call-parameters/_expected/umd.js b/test/form/samples/arrow-function-call-parameters/_expected/umd.js
index 039cd740cdf..8cecffec8f2 100644
--- a/test/form/samples/arrow-function-call-parameters/_expected/umd.js
+++ b/test/form/samples/arrow-function-call-parameters/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const callArg = arg => arg();
 	callArg( () => console.log( 'effect' ) );
@@ -34,4 +33,4 @@
 	const multiArgument2 = ( func, obj ) => func( obj );
 	multiArgument2( obj => obj.foo.bar = 1, {} );
 
-})));
+}));
diff --git a/test/form/samples/arrow-function-return-values/_expected/umd.js b/test/form/samples/arrow-function-return-values/_expected/umd.js
index 81aa54fa84b..ed01b030f26 100644
--- a/test/form/samples/arrow-function-return-values/_expected/umd.js
+++ b/test/form/samples/arrow-function-return-values/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	(() => () => console.log( 'effect' ))()();
 	(() => () => () => console.log( 'effect' ))()()();
@@ -15,4 +14,4 @@
 	(() => ({ foo: () => console.log( 'effect' ) }))().foo();
 	(() => ({ foo: () => ({ bar: () => console.log( 'effect' ) }) }))().foo().bar();
 
-})));
+}));
diff --git a/test/form/samples/assignment-to-array-buffer-view/_expected/umd.js b/test/form/samples/assignment-to-array-buffer-view/_expected/umd.js
index 0096b40667d..294e3576748 100644
--- a/test/form/samples/assignment-to-array-buffer-view/_expected/umd.js
+++ b/test/form/samples/assignment-to-array-buffer-view/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.bundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.bundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var buffer = new ArrayBuffer( 8 );
 
@@ -15,4 +15,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/assignment-to-exports-class-declaration/_expected/umd.js b/test/form/samples/assignment-to-exports-class-declaration/_expected/umd.js
index 095817f2ef9..15ccce3ffff 100644
--- a/test/form/samples/assignment-to-exports-class-declaration/_expected/umd.js
+++ b/test/form/samples/assignment-to-exports-class-declaration/_expected/umd.js
@@ -1,12 +1,12 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.myModule = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.myModule = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	exports.Foo = class Foo {};
 	exports.Foo = lol( exports.Foo );
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/assignment-to-exports/_expected/umd.js b/test/form/samples/assignment-to-exports/_expected/umd.js
index aa6fa0c8ccd..ecc3f3fedce 100644
--- a/test/form/samples/assignment-to-exports/_expected/umd.js
+++ b/test/form/samples/assignment-to-exports/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.bundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.bundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	// Unassigned export
 	var foo1;
@@ -32,4 +32,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/assignment-to-global/_expected/umd.js b/test/form/samples/assignment-to-global/_expected/umd.js
index d3c781c4db8..6b9ab0bbaf2 100644
--- a/test/form/samples/assignment-to-global/_expected/umd.js
+++ b/test/form/samples/assignment-to-global/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	globalVar = 1;
 
-})));
+}));
diff --git a/test/form/samples/async-function-unused/_expected/umd.js b/test/form/samples/async-function-unused/_expected/umd.js
index 0be18ef3098..908abff5886 100644
--- a/test/form/samples/async-function-unused/_expected/umd.js
+++ b/test/form/samples/async-function-unused/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	async function foo () {
 		return 'foo';
@@ -10,4 +9,4 @@
 
 	foo().then( value => console.log( value ) );
 
-})));
+}));
diff --git a/test/form/samples/banner-and-footer/_expected/umd.js b/test/form/samples/banner-and-footer/_expected/umd.js
index 36431aa994b..dca66b4c920 100644
--- a/test/form/samples/banner-and-footer/_expected/umd.js
+++ b/test/form/samples/banner-and-footer/_expected/umd.js
@@ -2,15 +2,14 @@
 /* first banner */
 /* second banner */
 /* 3rd banner */
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 'hello world' );
 
-})));
+}));
 /* this is a footer */
 /* first footer */
 /* second footer */
diff --git a/test/form/samples/block-comments/_expected/umd.js b/test/form/samples/block-comments/_expected/umd.js
index 6afff4a7f83..7cd35b73402 100644
--- a/test/form/samples/block-comments/_expected/umd.js
+++ b/test/form/samples/block-comments/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo () {
 		return embiggen( 6, 7 );
@@ -20,4 +19,4 @@
 
 	alert( foo() );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/body-less-for-loops/_expected/iife.js b/test/form/samples/body-less-for-loops/_expected/iife.js
index 2214bd42fe3..746d2213774 100644
--- a/test/form/samples/body-less-for-loops/_expected/iife.js
+++ b/test/form/samples/body-less-for-loops/_expected/iife.js
@@ -14,4 +14,4 @@
 	let index;
 	for ( index in array ) console.log( index );
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/body-less-for-loops/_expected/umd.js b/test/form/samples/body-less-for-loops/_expected/umd.js
index 98400216c1d..2a72593f38d 100644
--- a/test/form/samples/body-less-for-loops/_expected/umd.js
+++ b/test/form/samples/body-less-for-loops/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	for ( let i = 0; i < 10; i += 1 ) console.log( i );
 	for ( const letter of array ) console.log( letter );
@@ -17,4 +16,4 @@
 	let index;
 	for ( index in array ) console.log( index );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/catch-parameter-shadowing/_expected/umd.js b/test/form/samples/catch-parameter-shadowing/_expected/umd.js
index faeaef68645..70c25ca8e30 100644
--- a/test/form/samples/catch-parameter-shadowing/_expected/umd.js
+++ b/test/form/samples/catch-parameter-shadowing/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.bundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.bundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	const e = 2.7182818284;
 
@@ -18,4 +18,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/circular-member-expression/_expected/umd.js b/test/form/samples/circular-member-expression/_expected/umd.js
index 48f8e198162..12135b744e0 100644
--- a/test/form/samples/circular-member-expression/_expected/umd.js
+++ b/test/form/samples/circular-member-expression/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
   typeof define === 'function' && define.amd ? define(factory) :
-  (factory());
-}(this, (function () { 'use strict';
+  factory();
+}(function () { 'use strict';
 
   var foo = function() {
     foo.toString = null;
@@ -10,4 +9,4 @@
 
   console.log(foo);
 
-})));
+}));
diff --git a/test/form/samples/class-constructor-side-effect/_expected/umd.js b/test/form/samples/class-constructor-side-effect/_expected/umd.js
index c4409fe0720..82f801be7d2 100644
--- a/test/form/samples/class-constructor-side-effect/_expected/umd.js
+++ b/test/form/samples/class-constructor-side-effect/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	class Foo {
 		constructor () {
@@ -12,4 +11,4 @@
 
 	new Foo;
 
-})));
+}));
diff --git a/test/form/samples/comment-before-import/_expected/umd.js b/test/form/samples/comment-before-import/_expected/umd.js
index b0cde703cee..3ce8aeb6bd7 100644
--- a/test/form/samples/comment-before-import/_expected/umd.js
+++ b/test/form/samples/comment-before-import/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	// bar.js
 	var bar = 21;
@@ -15,4 +14,4 @@
 
 	console.log( foo );
 
-})));
+}));
diff --git a/test/form/samples/comment-start-inside-comment/_expected/umd.js b/test/form/samples/comment-start-inside-comment/_expected/umd.js
index 9958baf05c5..b2ea0f7a1a0 100644
--- a/test/form/samples/comment-start-inside-comment/_expected/umd.js
+++ b/test/form/samples/comment-start-inside-comment/_expected/umd.js
@@ -1,12 +1,11 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var foo = () => 'foo';
 
 	// /*
 	console.log(foo());
 
-})));
+}));
diff --git a/test/form/samples/compact/_expected/umd.js b/test/form/samples/compact/_expected/umd.js
index 26da37cc20f..24dad306b2b 100644
--- a/test/form/samples/compact/_expected/umd.js
+++ b/test/form/samples/compact/_expected/umd.js
@@ -1,6 +1,6 @@
-(function(global,factory){typeof exports==='object'&&typeof module!=='undefined'?module.exports=factory(require('external')):typeof define==='function'&&define.amd?define(['external'],factory):(global.foo=factory(global.x));}(this,(function(x){'use strict';x=x&&x.hasOwnProperty('default')?x['default']:x;var self = {get default(){return foo$$1}};if(typeof Symbol!=='undefined'&&Symbol.toStringTag)Object.defineProperty(self,Symbol.toStringTag,{value:'Module'});else Object.defineProperty(self,'toString',{value:function(){return'[object Module]';}});/*#__PURE__*/Object.freeze(self);console.log(self);
+(function(global,factory){typeof exports==='object'&&typeof module!=='undefined'?module.exports=factory(require('external')):typeof define==='function'&&define.amd?define(['external'],factory):global.foo=factory(global.x);}(typeof self!=='undefined'?self:this,function(x){'use strict';x=x&&x.hasOwnProperty('default')?x['default']:x;var self = {get default(){return foo$$1}};if(typeof Symbol!=='undefined'&&Symbol.toStringTag)Object.defineProperty(self,Symbol.toStringTag,{value:'Module'});else Object.defineProperty(self,'toString',{value:function(){return'[object Module]';}});/*#__PURE__*/Object.freeze(self);console.log(self);
 function foo$$1 () {
 	console.log( x );
 }
 // trailing comment
-return foo$$1;})));
\ No newline at end of file
+return foo$$1;}));
\ No newline at end of file
diff --git a/test/form/samples/computed-member-expression-assignments/_expected/umd.js b/test/form/samples/computed-member-expression-assignments/_expected/umd.js
index 1ffe0c39f81..69834d5df84 100644
--- a/test/form/samples/computed-member-expression-assignments/_expected/umd.js
+++ b/test/form/samples/computed-member-expression-assignments/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const retained1 = { foo: {} };
 	retained1[ 'f' + 'oo' ] = globalVar;
@@ -21,4 +20,4 @@
 	const retained5 = { foo: function () {this.x = 1;} };
 	retained5[ 'f' + 'oo' ]();
 
-})));
+}));
diff --git a/test/form/samples/computed-properties/_expected/umd.js b/test/form/samples/computed-properties/_expected/umd.js
index 786da7d6d56..68569e48477 100644
--- a/test/form/samples/computed-properties/_expected/umd.js
+++ b/test/form/samples/computed-properties/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.computedProperties = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.computedProperties = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var foo = 'foo';
 	var bar = 'bar';
@@ -22,4 +22,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/conditional-expression/_expected/umd.js b/test/form/samples/conditional-expression/_expected/umd.js
index 47ebb10a071..ecc38e4bc9a 100644
--- a/test/form/samples/conditional-expression/_expected/umd.js
+++ b/test/form/samples/conditional-expression/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	// side-effect in condition
 	var a = foo() ? 1 : 2;
@@ -22,4 +21,4 @@
 	var i2 = (function () {this.x = 1;})();
 	var i3 = (() => () => console.log( 'effect' ))()();
 
-})));
+}));
diff --git a/test/form/samples/conditional-put-parens-around-sequence/_expected/umd.js b/test/form/samples/conditional-put-parens-around-sequence/_expected/umd.js
index 8e6ba80b9ff..cf1f8d79ea5 100644
--- a/test/form/samples/conditional-put-parens-around-sequence/_expected/umd.js
+++ b/test/form/samples/conditional-put-parens-around-sequence/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var a = (foo(), 3 );
 	var b = (bar(), 6 );
@@ -11,4 +10,4 @@
 	// verify works with no whitespace
 	bar((foo(),2),(bar(),8));
 
-})));
+}));
diff --git a/test/form/samples/conflicting-imports/_expected/umd.js b/test/form/samples/conflicting-imports/_expected/umd.js
index 4a2b5f7ee6e..7d5c2c962ca 100644
--- a/test/form/samples/conflicting-imports/_expected/umd.js
+++ b/test/form/samples/conflicting-imports/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('foo'), require('bar')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['foo', 'bar'], factory) :
-	(factory(global.foo,global.bar));
-}(this, (function (foo,bar) { 'use strict';
+	factory(global.foo,global.bar);
+}(function (foo,bar) { 'use strict';
 
 	console.log( bar.a );
 
 	console.log( foo.a );
 
-})));
+}));
diff --git a/test/form/samples/curried-function/_expected/umd.js b/test/form/samples/curried-function/_expected/umd.js
index bae9178e089..5c0780e9b59 100644
--- a/test/form/samples/curried-function/_expected/umd.js
+++ b/test/form/samples/curried-function/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function curry1 ( fn ) {
 		return function f1 ( a ) {
@@ -18,4 +17,4 @@
 
 	var T = always(true);
 
-})));
+}));
diff --git a/test/form/samples/custom-context/_expected/umd.js b/test/form/samples/custom-context/_expected/umd.js
index a73a22c0de7..33823ec7a0b 100644
--- a/test/form/samples/custom-context/_expected/umd.js
+++ b/test/form/samples/custom-context/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	lolwut.prop = '???';
 
-})));
+}));
diff --git a/test/form/samples/custom-module-context-function/_expected/umd.js b/test/form/samples/custom-module-context-function/_expected/umd.js
index 22fa60526fe..85607e6c243 100644
--- a/test/form/samples/custom-module-context-function/_expected/umd.js
+++ b/test/form/samples/custom-module-context-function/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	undefined.prop = 'nope';
 
 	lolwut.prop = '???';
 
-})));
+}));
diff --git a/test/form/samples/custom-module-context/_expected/umd.js b/test/form/samples/custom-module-context/_expected/umd.js
index 22fa60526fe..85607e6c243 100644
--- a/test/form/samples/custom-module-context/_expected/umd.js
+++ b/test/form/samples/custom-module-context/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	undefined.prop = 'nope';
 
 	lolwut.prop = '???';
 
-})));
+}));
diff --git a/test/form/samples/dedupes-external-imports/_expected/umd.js b/test/form/samples/dedupes-external-imports/_expected/umd.js
index 7d7c0e4933b..353c196e261 100644
--- a/test/form/samples/dedupes-external-imports/_expected/umd.js
+++ b/test/form/samples/dedupes-external-imports/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'external'], factory) :
-	(factory((global.myBundle = {}),global.external));
-}(this, (function (exports,external) { 'use strict';
+	factory(global.myBundle = {},global.external);
+}(typeof self !== 'undefined' ? self : this, function (exports,external) { 'use strict';
 
 	class Foo extends external.Component {
 		constructor () {
@@ -35,4 +35,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/default-identifier-deshadowing/_expected/umd.js b/test/form/samples/default-identifier-deshadowing/_expected/umd.js
index 1329f3fb6c1..cf2098c6428 100644
--- a/test/form/samples/default-identifier-deshadowing/_expected/umd.js
+++ b/test/form/samples/default-identifier-deshadowing/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
   typeof define === 'function' && define.amd ? define(factory) :
-  (factory());
-}(this, (function () { 'use strict';
+  factory();
+}(function () { 'use strict';
 
   function a() {
     a = someGlobal;
@@ -11,4 +10,4 @@
 
   a();
 
-})));
+}));
diff --git a/test/form/samples/define-es-modules-false/_expected/umd.js b/test/form/samples/define-es-modules-false/_expected/umd.js
index cba03fcad05..55024228e64 100644
--- a/test/form/samples/define-es-modules-false/_expected/umd.js
+++ b/test/form/samples/define-es-modules-false/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.foo = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.foo = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	const make1 = () => {};
 
@@ -11,4 +11,4 @@
 	exports.make1 = make1;
 	exports.make2 = make2;
 
-})));
+}));
diff --git a/test/form/samples/define-replacement/_expected/iife.js b/test/form/samples/define-replacement/_expected/iife.js
index cb9df4a40c8..46c38fba33b 100644
--- a/test/form/samples/define-replacement/_expected/iife.js
+++ b/test/form/samples/define-replacement/_expected/iife.js
@@ -8,4 +8,4 @@
     a();
     a();
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/define-replacement/_expected/umd.js b/test/form/samples/define-replacement/_expected/umd.js
index dbcc80f7692..95b92bbf612 100644
--- a/test/form/samples/define-replacement/_expected/umd.js
+++ b/test/form/samples/define-replacement/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
     typeof enifed === 'function' && enifed.amd ? enifed(factory) :
-    (factory());
-}(this, (function () { 'use strict';
+    factory();
+}(function () { 'use strict';
 
     var a = () => {
         console.log('props');
@@ -11,4 +10,4 @@
     a();
     a();
 
-})));
+}));
diff --git a/test/form/samples/duplicated-var-declarations/_expected/umd.js b/test/form/samples/duplicated-var-declarations/_expected/umd.js
index 6a288c92447..321be09858c 100644
--- a/test/form/samples/duplicated-var-declarations/_expected/umd.js
+++ b/test/form/samples/duplicated-var-declarations/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var a = 1, b = 2;
 
@@ -15,4 +14,4 @@
 	assert.equal( b, 4 );
 	assert.equal( c, 5 );
 
-})));
+}));
diff --git a/test/form/samples/effect-in-for-of-loop-in-functions/_expected/umd.js b/test/form/samples/effect-in-for-of-loop-in-functions/_expected/umd.js
index 7141426d87f..d3f96c6fdb8 100644
--- a/test/form/samples/effect-in-for-of-loop-in-functions/_expected/umd.js
+++ b/test/form/samples/effect-in-for-of-loop-in-functions/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const items = { children: [ {}, {}, {} ] };
 
@@ -29,4 +28,4 @@
 		{ foo: 'a', bar: 'c' }
 	] );
 
-})));
+}));
diff --git a/test/form/samples/effect-in-for-of-loop/_expected/umd.js b/test/form/samples/effect-in-for-of-loop/_expected/umd.js
index 79ae821c7fb..53dad9968fd 100644
--- a/test/form/samples/effect-in-for-of-loop/_expected/umd.js
+++ b/test/form/samples/effect-in-for-of-loop/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const items = [{}, {}, {}];
 
@@ -26,4 +25,4 @@
 		{ foo: 'a', bar: 'c', baz: 'e' }
 	]);
 
-})));
+}));
diff --git a/test/form/samples/empty-block-statement/_expected/umd.js b/test/form/samples/empty-block-statement/_expected/umd.js
index 0aae43fe29d..407e9a0ed49 100644
--- a/test/form/samples/empty-block-statement/_expected/umd.js
+++ b/test/form/samples/empty-block-statement/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 1 );
 	console.log( 2 );
 
-})));
+}));
diff --git a/test/form/samples/empty-do-while-statement/_expected/iife.js b/test/form/samples/empty-do-while-statement/_expected/iife.js
index 39aedbf4a6a..08a84a95e53 100644
--- a/test/form/samples/empty-do-while-statement/_expected/iife.js
+++ b/test/form/samples/empty-do-while-statement/_expected/iife.js
@@ -4,4 +4,4 @@
 	console.log( 1 );
 	console.log( 2 );
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/empty-do-while-statement/_expected/umd.js b/test/form/samples/empty-do-while-statement/_expected/umd.js
index 044519377f3..407e9a0ed49 100644
--- a/test/form/samples/empty-do-while-statement/_expected/umd.js
+++ b/test/form/samples/empty-do-while-statement/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 1 );
 	console.log( 2 );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/empty-for-in-statement/_expected/iife.js b/test/form/samples/empty-for-in-statement/_expected/iife.js
index 39aedbf4a6a..08a84a95e53 100644
--- a/test/form/samples/empty-for-in-statement/_expected/iife.js
+++ b/test/form/samples/empty-for-in-statement/_expected/iife.js
@@ -4,4 +4,4 @@
 	console.log( 1 );
 	console.log( 2 );
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/empty-for-in-statement/_expected/umd.js b/test/form/samples/empty-for-in-statement/_expected/umd.js
index 044519377f3..407e9a0ed49 100644
--- a/test/form/samples/empty-for-in-statement/_expected/umd.js
+++ b/test/form/samples/empty-for-in-statement/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 1 );
 	console.log( 2 );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/empty-for-of-statement/_expected/iife.js b/test/form/samples/empty-for-of-statement/_expected/iife.js
index 39aedbf4a6a..08a84a95e53 100644
--- a/test/form/samples/empty-for-of-statement/_expected/iife.js
+++ b/test/form/samples/empty-for-of-statement/_expected/iife.js
@@ -4,4 +4,4 @@
 	console.log( 1 );
 	console.log( 2 );
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/empty-for-of-statement/_expected/umd.js b/test/form/samples/empty-for-of-statement/_expected/umd.js
index 044519377f3..407e9a0ed49 100644
--- a/test/form/samples/empty-for-of-statement/_expected/umd.js
+++ b/test/form/samples/empty-for-of-statement/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 1 );
 	console.log( 2 );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/empty-for-statement/_expected/umd.js b/test/form/samples/empty-for-statement/_expected/umd.js
index 0aae43fe29d..407e9a0ed49 100644
--- a/test/form/samples/empty-for-statement/_expected/umd.js
+++ b/test/form/samples/empty-for-statement/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 1 );
 	console.log( 2 );
 
-})));
+}));
diff --git a/test/form/samples/empty-if-statement/_expected/iife.js b/test/form/samples/empty-if-statement/_expected/iife.js
index 39aedbf4a6a..08a84a95e53 100644
--- a/test/form/samples/empty-if-statement/_expected/iife.js
+++ b/test/form/samples/empty-if-statement/_expected/iife.js
@@ -4,4 +4,4 @@
 	console.log( 1 );
 	console.log( 2 );
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/empty-if-statement/_expected/umd.js b/test/form/samples/empty-if-statement/_expected/umd.js
index 044519377f3..407e9a0ed49 100644
--- a/test/form/samples/empty-if-statement/_expected/umd.js
+++ b/test/form/samples/empty-if-statement/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 1 );
 	console.log( 2 );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/empty-statement-consequent/_expected/umd.js b/test/form/samples/empty-statement-consequent/_expected/umd.js
index c9e6b4b967a..3ba2a3c6719 100644
--- a/test/form/samples/empty-statement-consequent/_expected/umd.js
+++ b/test/form/samples/empty-statement-consequent/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	if ( a === 0 );
 	else a++;
 
-})));
+}));
diff --git a/test/form/samples/empty-statement/_expected/umd.js b/test/form/samples/empty-statement/_expected/umd.js
index a1f6dfc10c0..32b4a2890d8 100644
--- a/test/form/samples/empty-statement/_expected/umd.js
+++ b/test/form/samples/empty-statement/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 1 );console.log( 2 );
 
-})));
+}));
diff --git a/test/form/samples/empty-switch-statement/_expected/iife.js b/test/form/samples/empty-switch-statement/_expected/iife.js
index 39aedbf4a6a..08a84a95e53 100644
--- a/test/form/samples/empty-switch-statement/_expected/iife.js
+++ b/test/form/samples/empty-switch-statement/_expected/iife.js
@@ -4,4 +4,4 @@
 	console.log( 1 );
 	console.log( 2 );
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/empty-switch-statement/_expected/umd.js b/test/form/samples/empty-switch-statement/_expected/umd.js
index 044519377f3..407e9a0ed49 100644
--- a/test/form/samples/empty-switch-statement/_expected/umd.js
+++ b/test/form/samples/empty-switch-statement/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 1 );
 	console.log( 2 );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/empty-try-catch-statement/_expected/iife.js b/test/form/samples/empty-try-catch-statement/_expected/iife.js
index 39aedbf4a6a..08a84a95e53 100644
--- a/test/form/samples/empty-try-catch-statement/_expected/iife.js
+++ b/test/form/samples/empty-try-catch-statement/_expected/iife.js
@@ -4,4 +4,4 @@
 	console.log( 1 );
 	console.log( 2 );
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/empty-try-catch-statement/_expected/umd.js b/test/form/samples/empty-try-catch-statement/_expected/umd.js
index 044519377f3..407e9a0ed49 100644
--- a/test/form/samples/empty-try-catch-statement/_expected/umd.js
+++ b/test/form/samples/empty-try-catch-statement/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 1 );
 	console.log( 2 );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/empty-while-statement/_expected/iife.js b/test/form/samples/empty-while-statement/_expected/iife.js
index 39aedbf4a6a..08a84a95e53 100644
--- a/test/form/samples/empty-while-statement/_expected/iife.js
+++ b/test/form/samples/empty-while-statement/_expected/iife.js
@@ -4,4 +4,4 @@
 	console.log( 1 );
 	console.log( 2 );
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/empty-while-statement/_expected/umd.js b/test/form/samples/empty-while-statement/_expected/umd.js
index 044519377f3..407e9a0ed49 100644
--- a/test/form/samples/empty-while-statement/_expected/umd.js
+++ b/test/form/samples/empty-while-statement/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 1 );
 	console.log( 2 );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/erroneous-nested-member-expression/_expected/umd.js b/test/form/samples/erroneous-nested-member-expression/_expected/umd.js
index 94dee16b404..419cbd686b0 100644
--- a/test/form/samples/erroneous-nested-member-expression/_expected/umd.js
+++ b/test/form/samples/erroneous-nested-member-expression/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function yar() {
 		return {
@@ -14,4 +13,4 @@
 
 	yar.har();
 
-})));
+}));
diff --git a/test/form/samples/exclude-unnecessary-modifications/_expected/umd.js b/test/form/samples/exclude-unnecessary-modifications/_expected/umd.js
index 457d3c23211..e981f0d05dd 100644
--- a/test/form/samples/exclude-unnecessary-modifications/_expected/umd.js
+++ b/test/form/samples/exclude-unnecessary-modifications/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var foo = {};
 
@@ -29,4 +28,4 @@
 
 	console.log( foo );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/exponentiation-operator/_expected/umd.js b/test/form/samples/exponentiation-operator/_expected/umd.js
index 874c1d97df9..0e281243c62 100644
--- a/test/form/samples/exponentiation-operator/_expected/umd.js
+++ b/test/form/samples/exponentiation-operator/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	{
 		console.log('8 is larger than 7');
 	}
 
-})));
+}));
diff --git a/test/form/samples/export-all-from-internal/_expected/umd.js b/test/form/samples/export-all-from-internal/_expected/umd.js
index 4a0ab00b41a..b514b3f7e9a 100644
--- a/test/form/samples/export-all-from-internal/_expected/umd.js
+++ b/test/form/samples/export-all-from-internal/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.exposedInternals = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.exposedInternals = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	const a = 1;
 	const b = 2;
@@ -12,4 +12,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/export-all-multiple/_expected/umd.js b/test/form/samples/export-all-multiple/_expected/umd.js
index 89ad80b9cc0..a13949e213a 100644
--- a/test/form/samples/export-all-multiple/_expected/umd.js
+++ b/test/form/samples/export-all-multiple/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('foo'), require('bar'), require('baz')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'foo', 'bar', 'baz'], factory) :
-	(factory((global.myBundle = {}),global.foo,global.bar,global.baz));
-}(this, (function (exports,foo,bar,baz) { 'use strict';
+	factory(global.myBundle = {},global.foo,global.bar,global.baz);
+}(typeof self !== 'undefined' ? self : this, function (exports,foo,bar,baz) { 'use strict';
 
 	Object.keys(foo).forEach(function (key) { exports[key] = foo[key]; });
 	Object.keys(bar).forEach(function (key) { exports[key] = bar[key]; });
@@ -10,4 +10,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/export-default-2/_expected/umd.js b/test/form/samples/export-default-2/_expected/umd.js
index 73b73a1d25c..43acc2ac2cc 100644
--- a/test/form/samples/export-default-2/_expected/umd.js
+++ b/test/form/samples/export-default-2/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var bar = 1;
 
 	return bar;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/export-default-3/_expected/umd.js b/test/form/samples/export-default-3/_expected/umd.js
index 73b73a1d25c..43acc2ac2cc 100644
--- a/test/form/samples/export-default-3/_expected/umd.js
+++ b/test/form/samples/export-default-3/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var bar = 1;
 
 	return bar;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/export-default-anonymous-declarations/_expected/umd.js b/test/form/samples/export-default-anonymous-declarations/_expected/umd.js
index 36013b7c1d6..779fadfdca3 100644
--- a/test/form/samples/export-default-anonymous-declarations/_expected/umd.js
+++ b/test/form/samples/export-default-anonymous-declarations/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
   typeof define === 'function' && define.amd ? define(factory) :
-  (factory());
-}(this, (function () { 'use strict';
+  factory();
+}(function () { 'use strict';
 
   // jsjjjsjjjjsjs
 
@@ -91,4 +90,4 @@
   spacelessFn();
   spacelessGenerator();
 
-})));
+}));
diff --git a/test/form/samples/export-default-import/_expected/umd.js b/test/form/samples/export-default-import/_expected/umd.js
index 7444600e1c9..3d81d0c5a76 100644
--- a/test/form/samples/export-default-import/_expected/umd.js
+++ b/test/form/samples/export-default-import/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('x')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'x'], factory) :
-	(factory((global.myBundle = {}),global.x));
-}(this, (function (exports,x) { 'use strict';
+	factory(global.myBundle = {},global.x);
+}(typeof self !== 'undefined' ? self : this, function (exports,x) { 'use strict';
 
 	x = x && x.hasOwnProperty('default') ? x['default'] : x;
 
@@ -12,4 +12,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/export-default/_expected/umd.js b/test/form/samples/export-default/_expected/umd.js
index 2194031a608..5d988c0df7c 100644
--- a/test/form/samples/export-default/_expected/umd.js
+++ b/test/form/samples/export-default/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/export-globals/_expected/umd.js b/test/form/samples/export-globals/_expected/umd.js
index 7c334680eb7..218c9734b69 100644
--- a/test/form/samples/export-globals/_expected/umd.js
+++ b/test/form/samples/export-globals/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.myBundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.myBundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	const isNaN$1 = isNaN;
 
@@ -10,4 +10,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/export-live-bindings/_expected/umd.js b/test/form/samples/export-live-bindings/_expected/umd.js
index 2b18b07d010..34f3e77fd8c 100644
--- a/test/form/samples/export-live-bindings/_expected/umd.js
+++ b/test/form/samples/export-live-bindings/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
   typeof define === 'function' && define.amd ? define(['exports'], factory) :
-  (factory((global.iife = {})));
-}(this, (function (exports) { 'use strict';
+  factory(global.iife = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
   function update () {
     exports.foo += 10;
@@ -38,4 +38,4 @@
 
   Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/export-multiple-vars/_expected/umd.js b/test/form/samples/export-multiple-vars/_expected/umd.js
index fe8a09dfcd0..5ba19eb59ee 100644
--- a/test/form/samples/export-multiple-vars/_expected/umd.js
+++ b/test/form/samples/export-multiple-vars/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var a = 1;
 
@@ -14,4 +13,4 @@
 	assert.equal( e, 5 );
 	assert.equal( i, 9 );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/exports-at-end-if-possible/_expected/umd.js b/test/form/samples/exports-at-end-if-possible/_expected/umd.js
index d19ba5ddb20..ef8e2853278 100644
--- a/test/form/samples/exports-at-end-if-possible/_expected/umd.js
+++ b/test/form/samples/exports-at-end-if-possible/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.myBundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.myBundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var FOO = 'foo';
 
@@ -14,4 +14,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/extend-exports/_expected/iife.js b/test/form/samples/extend-exports/_expected/iife.js
index 5cddbe0c992..bb88f242694 100644
--- a/test/form/samples/extend-exports/_expected/iife.js
+++ b/test/form/samples/extend-exports/_expected/iife.js
@@ -5,4 +5,4 @@
 
 	exports.answer = answer;
 
-}((this.foo = this.foo || {})));
+}(this.foo = this.foo || {}));
diff --git a/test/form/samples/extend-exports/_expected/umd.js b/test/form/samples/extend-exports/_expected/umd.js
index 55b0d791f77..661338c351b 100644
--- a/test/form/samples/extend-exports/_expected/umd.js
+++ b/test/form/samples/extend-exports/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.foo = global.foo || {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.foo = global.foo || {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	const answer = 42;
 
@@ -10,4 +10,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/extend-namespaced-exports/_expected/iife.js b/test/form/samples/extend-namespaced-exports/_expected/iife.js
index 1b21487c31b..601131e4f22 100644
--- a/test/form/samples/extend-namespaced-exports/_expected/iife.js
+++ b/test/form/samples/extend-namespaced-exports/_expected/iife.js
@@ -7,4 +7,4 @@ this.foo.bar = this.foo.bar || {};
 
 	exports.answer = answer;
 
-}((this.foo.bar.baz = this.foo.bar.baz || {})));
+}(this.foo.bar.baz = this.foo.bar.baz || {}));
diff --git a/test/form/samples/extend-namespaced-exports/_expected/umd.js b/test/form/samples/extend-namespaced-exports/_expected/umd.js
index aa4c0b0562b..c2fe554c014 100644
--- a/test/form/samples/extend-namespaced-exports/_expected/umd.js
+++ b/test/form/samples/extend-namespaced-exports/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.foo = global.foo || {}, global.foo.bar = global.foo.bar || {}, global.foo.bar.baz = global.foo.bar.baz || {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.foo = global.foo || {}, global.foo.bar = global.foo.bar || {}, global.foo.bar.baz = global.foo.bar.baz || {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	const answer = 42;
 
@@ -10,4 +10,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/external-deshadowing/_expected/umd.js b/test/form/samples/external-deshadowing/_expected/umd.js
index 779fd571b66..60e8ef34deb 100644
--- a/test/form/samples/external-deshadowing/_expected/umd.js
+++ b/test/form/samples/external-deshadowing/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('a'), require('b')) :
   typeof define === 'function' && define.amd ? define(['exports', 'a', 'b'], factory) :
-  (factory((global.myBundle = {}),global.a,global.Test));
-}(this, (function (exports,a,Test) { 'use strict';
+  factory(global.myBundle = {},global.a,global.Test);
+}(typeof self !== 'undefined' ? self : this, function (exports,a,Test) { 'use strict';
 
   Test = Test && Test.hasOwnProperty('default') ? Test['default'] : Test;
 
@@ -19,4 +19,4 @@
 
   Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/external-empty-import-no-global-b/_expected/umd.js b/test/form/samples/external-empty-import-no-global-b/_expected/umd.js
index d428b3f2b71..104d7fee3d6 100644
--- a/test/form/samples/external-empty-import-no-global-b/_expected/umd.js
+++ b/test/form/samples/external-empty-import-no-global-b/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('babel-polyfill'), require('other')) :
 	typeof define === 'function' && define.amd ? define(['babel-polyfill', 'other'], factory) :
-	(global.myBundle = factory(null,global.other));
-}(this, (function (babelPolyfill,other) { 'use strict';
+	global.myBundle = factory(null,global.other);
+}(typeof self !== 'undefined' ? self : this, function (babelPolyfill,other) { 'use strict';
 
 	other.x();
 
@@ -10,4 +10,4 @@
 
 	return main;
 
-})));
+}));
diff --git a/test/form/samples/external-empty-import-no-global/_expected/umd.js b/test/form/samples/external-empty-import-no-global/_expected/umd.js
index 48ad8dfefe7..fa16d94e13b 100644
--- a/test/form/samples/external-empty-import-no-global/_expected/umd.js
+++ b/test/form/samples/external-empty-import-no-global/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('babel-polyfill')) :
 	typeof define === 'function' && define.amd ? define(['babel-polyfill'], factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var main = new WeakMap();
 
 	return main;
 
-})));
+}));
diff --git a/test/form/samples/external-export-tracing/_expected/umd.js b/test/form/samples/external-export-tracing/_expected/umd.js
index a93a1996eea..a81f0a79a20 100644
--- a/test/form/samples/external-export-tracing/_expected/umd.js
+++ b/test/form/samples/external-export-tracing/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'external'], factory) :
-	(factory((global.myBundle = {}),global.external));
-}(this, (function (exports,external) { 'use strict';
+	factory(global.myBundle = {},global.external);
+}(typeof self !== 'undefined' ? self : this, function (exports,external) { 'use strict';
 
 	exports.s = external.p;
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/external-import-alias-shadow/_expected/umd.js b/test/form/samples/external-import-alias-shadow/_expected/umd.js
index 599f5fd3b56..8ab00cff5cf 100644
--- a/test/form/samples/external-import-alias-shadow/_expected/umd.js
+++ b/test/form/samples/external-import-alias-shadow/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('acorn')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['acorn'], factory) :
-	(factory(global.acorn));
-}(this, (function (acorn) { 'use strict';
+	factory(global.acorn);
+}(function (acorn) { 'use strict';
 
 	function parse(source) {
 		return acorn.parse(source, { ecmaVersion: 6 });
@@ -10,4 +9,4 @@
 
 	console.log(parse('foo'));
 
-})));
+}));
diff --git a/test/form/samples/external-imports-custom-names-function/_expected/iife.js b/test/form/samples/external-imports-custom-names-function/_expected/iife.js
index 07f634a52ee..7618f149095 100644
--- a/test/form/samples/external-imports-custom-names-function/_expected/iife.js
+++ b/test/form/samples/external-imports-custom-names-function/_expected/iife.js
@@ -3,4 +3,4 @@
 
 	aBC.foo();
 
-}(a_b_c));
\ No newline at end of file
+}(a_b_c));
diff --git a/test/form/samples/external-imports-custom-names-function/_expected/umd.js b/test/form/samples/external-imports-custom-names-function/_expected/umd.js
index c9464dd5fff..9bae2564fb5 100644
--- a/test/form/samples/external-imports-custom-names-function/_expected/umd.js
+++ b/test/form/samples/external-imports-custom-names-function/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('a-b-c')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['a-b-c'], factory) :
-	(factory(global.a_b_c));
-}(this, (function (aBC) { 'use strict';
+	factory(global.a_b_c);
+}(function (aBC) { 'use strict';
 
 	aBC.foo();
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/external-imports-custom-names/_expected/umd.js b/test/form/samples/external-imports-custom-names/_expected/umd.js
index 5aa7695a5c0..b853ce9a841 100644
--- a/test/form/samples/external-imports-custom-names/_expected/umd.js
+++ b/test/form/samples/external-imports-custom-names/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['jquery'], factory) :
-	(factory(global.jQuery));
-}(this, (function ($) { 'use strict';
+	factory(global.jQuery);
+}(function ($) { 'use strict';
 
 	$ = $ && $.hasOwnProperty('default') ? $['default'] : $;
 
@@ -10,4 +9,4 @@
 		$( 'body' ).html( '<h1>hello world!</h1>' );
 	});
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/external-imports/_expected/umd.js b/test/form/samples/external-imports/_expected/umd.js
index dc40fff9be8..5bfb7a3d4b5 100644
--- a/test/form/samples/external-imports/_expected/umd.js
+++ b/test/form/samples/external-imports/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('factory'), require('baz'), require('shipping-port'), require('alphabet')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['factory', 'baz', 'shipping-port', 'alphabet'], factory) :
-	(factory(global.factory,global.baz,global.containers,global.alphabet));
-}(this, (function (factory,baz,containers,alphabet) { 'use strict';
+	factory(global.factory,global.baz,global.containers,global.alphabet);
+}(function (factory,baz,containers,alphabet) { 'use strict';
 
 	factory = factory && factory.hasOwnProperty('default') ? factory['default'] : factory;
 	var alphabet__default = 'default' in alphabet ? alphabet['default'] : alphabet;
@@ -13,4 +12,4 @@
 	console.log( alphabet.a );
 	console.log( alphabet__default.length );
 
-})));
+}));
diff --git a/test/form/samples/external-namespace-and-named/_expected/umd.js b/test/form/samples/external-namespace-and-named/_expected/umd.js
index bc1c12aa8fb..c7e14a25d25 100644
--- a/test/form/samples/external-namespace-and-named/_expected/umd.js
+++ b/test/form/samples/external-namespace-and-named/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('foo')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['foo'], factory) :
-	(factory(global.foo));
-}(this, (function (foo) { 'use strict';
+	factory(global.foo);
+}(function (foo) { 'use strict';
 
 	console.log(foo);
 	console.log(foo.blah);
 	console.log(foo.bar);
 
-})));
+}));
diff --git a/test/form/samples/external-namespace-reexport/_expected/umd.js b/test/form/samples/external-namespace-reexport/_expected/umd.js
index e8ba5ac2e78..99265b8c00e 100644
--- a/test/form/samples/external-namespace-reexport/_expected/umd.js
+++ b/test/form/samples/external-namespace-reexport/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('highcharts')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'highcharts'], factory) :
-	(factory((global.myBundle = {}),global.highcharts));
-}(this, (function (exports,highcharts) { 'use strict';
+	factory(global.myBundle = {},global.highcharts);
+}(typeof self !== 'undefined' ? self : this, function (exports,highcharts) { 'use strict';
 
 	exports.Highcharts = highcharts;
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/for-in-scopes/_expected/umd.js b/test/form/samples/for-in-scopes/_expected/umd.js
index 51ca20910dd..a7e1c46a35f 100644
--- a/test/form/samples/for-in-scopes/_expected/umd.js
+++ b/test/form/samples/for-in-scopes/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var effect1 = () => console.log( 'effect' );
 	var associated = () => {};
@@ -17,4 +16,4 @@
 
 	for ( globalVar in { x: 1 } ) {}
 
-})));
+}));
diff --git a/test/form/samples/for-loop-body-var-declaration/_expected/umd.js b/test/form/samples/for-loop-body-var-declaration/_expected/umd.js
index c50f8c4a11b..07d837a962a 100644
--- a/test/form/samples/for-loop-body-var-declaration/_expected/umd.js
+++ b/test/form/samples/for-loop-body-var-declaration/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	for(var x=1;x<2;x++)var d=x|0;console.log(d);
 
-})));
+}));
diff --git a/test/form/samples/for-loop-with-empty-head/_expected/iife.js b/test/form/samples/for-loop-with-empty-head/_expected/iife.js
index 22172342afe..ec08c262c7e 100644
--- a/test/form/samples/for-loop-with-empty-head/_expected/iife.js
+++ b/test/form/samples/for-loop-with-empty-head/_expected/iife.js
@@ -5,4 +5,4 @@
 		console.log( 42 );
 	}
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/for-loop-with-empty-head/_expected/umd.js b/test/form/samples/for-loop-with-empty-head/_expected/umd.js
index 3e90731c512..f4adddc07ba 100644
--- a/test/form/samples/for-loop-with-empty-head/_expected/umd.js
+++ b/test/form/samples/for-loop-with-empty-head/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	for ( ; ; ) {
 		console.log( 42 );
 	}
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/for-of-scopes/_expected/umd.js b/test/form/samples/for-of-scopes/_expected/umd.js
index 9d053cad1cf..e64a9051077 100644
--- a/test/form/samples/for-of-scopes/_expected/umd.js
+++ b/test/form/samples/for-of-scopes/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var effect1 = () => console.log( 'effect' );
 	var associated = () => {};
@@ -16,4 +15,4 @@
 
 	for ( globalVar of [ 1 ] ) {}
 
-})));
+}));
diff --git a/test/form/samples/for-scopes/_expected/umd.js b/test/form/samples/for-scopes/_expected/umd.js
index 46661e31a44..02948b84d25 100644
--- a/test/form/samples/for-scopes/_expected/umd.js
+++ b/test/form/samples/for-scopes/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var effect1 = () => console.log( 'effect' );
 	var associated = () => {};
@@ -17,4 +16,4 @@
 		break;
 	}
 
-})));
+}));
diff --git a/test/form/samples/freeze/_expected/umd.js b/test/form/samples/freeze/_expected/umd.js
index 212b3affbe8..79f9a42267a 100644
--- a/test/form/samples/freeze/_expected/umd.js
+++ b/test/form/samples/freeze/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.myBundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.myBundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	const foo = 1;
 	const bar = 2;
@@ -22,4 +22,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/function-body-return-values/_expected/umd.js b/test/form/samples/function-body-return-values/_expected/umd.js
index 6a97eda5558..7a116a711aa 100644
--- a/test/form/samples/function-body-return-values/_expected/umd.js
+++ b/test/form/samples/function-body-return-values/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function retained1 () {
 		return () => console.log( 'effect' );
@@ -43,4 +42,4 @@
 
 	retained6().x();
 
-})));
+}));
diff --git a/test/form/samples/function-call-parameters/_expected/umd.js b/test/form/samples/function-call-parameters/_expected/umd.js
index dc1acdbfe00..28fe1792c62 100644
--- a/test/form/samples/function-call-parameters/_expected/umd.js
+++ b/test/form/samples/function-call-parameters/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	// parameters are associated correctly
 	const retained1 = function ( func, obj ) { return func( obj ); };
@@ -47,4 +46,4 @@
 
 	retained7( {}, {} );
 
-})));
+}));
diff --git a/test/form/samples/function-mutation/_expected/umd.js b/test/form/samples/function-mutation/_expected/umd.js
index b70f448fcc0..2568bcc60c5 100644
--- a/test/form/samples/function-mutation/_expected/umd.js
+++ b/test/form/samples/function-mutation/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.bundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.bundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	function foo () {
 		console.log( 'foo' );
@@ -51,4 +51,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/function-scopes/_expected/umd.js b/test/form/samples/function-scopes/_expected/umd.js
index fc34d9ef208..b5ad2e37545 100644
--- a/test/form/samples/function-scopes/_expected/umd.js
+++ b/test/form/samples/function-scopes/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var effect1 = () => console.log( 'effect' ); // must not be removed!
 	function isKept1 ( x = effect1 ) {
@@ -22,4 +21,4 @@
 	};
 	isKept3();
 
-})));
+}));
diff --git a/test/form/samples/getter-return-values/_expected/umd.js b/test/form/samples/getter-return-values/_expected/umd.js
index c13eba2f73a..a1b57777113 100644
--- a/test/form/samples/getter-return-values/_expected/umd.js
+++ b/test/form/samples/getter-return-values/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	({
 		get foo () {
@@ -38,4 +37,4 @@
 		}
 	}).foo()();
 
-})));
+}));
diff --git a/test/form/samples/globals-removes-access-to-pure-function-members/_expected/umd.js b/test/form/samples/globals-removes-access-to-pure-function-members/_expected/umd.js
index 5a0cf15b9d7..f65554aa880 100644
--- a/test/form/samples/globals-removes-access-to-pure-function-members/_expected/umd.js
+++ b/test/form/samples/globals-removes-access-to-pure-function-members/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	Unknown.staticMember;
 	Unknown.prototype.method;
 
-})));
+}));
diff --git a/test/form/samples/ignore-property-access-side-effects/_expected/umd.js b/test/form/samples/ignore-property-access-side-effects/_expected/umd.js
index 07ce27e42f1..a12a1990f01 100644
--- a/test/form/samples/ignore-property-access-side-effects/_expected/umd.js
+++ b/test/form/samples/ignore-property-access-side-effects/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 
 
-})));
+}));
diff --git a/test/form/samples/implicit-undefined-assignments/_expected/umd.js b/test/form/samples/implicit-undefined-assignments/_expected/umd.js
index fa13e0b1720..4a1136649d9 100644
--- a/test/form/samples/implicit-undefined-assignments/_expected/umd.js
+++ b/test/form/samples/implicit-undefined-assignments/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	let a;
 	a();
@@ -16,4 +15,4 @@
 	let { d } = {};
 	d.foo = 'bar';
 
-})));
+}));
diff --git a/test/form/samples/import-external-namespace-and-default/_expected/umd.js b/test/form/samples/import-external-namespace-and-default/_expected/umd.js
index 2784f69bcfc..85be823d932 100644
--- a/test/form/samples/import-external-namespace-and-default/_expected/umd.js
+++ b/test/form/samples/import-external-namespace-and-default/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('foo')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['foo'], factory) :
-	(factory(global.foo));
-}(this, (function (foo) { 'use strict';
+	factory(global.foo);
+}(function (foo) { 'use strict';
 
 	var foo__default = 'default' in foo ? foo['default'] : foo;
 
@@ -10,4 +9,4 @@
 
 	console.log( foo__default );
 
-})));
+}));
diff --git a/test/form/samples/import-meta-url/_expected/umd.js b/test/form/samples/import-meta-url/_expected/umd.js
index e47eae027c9..6b3b6baa031 100644
--- a/test/form/samples/import-meta-url/_expected/umd.js
+++ b/test/form/samples/import-meta-url/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log((typeof document !== 'undefined' ? document.currentScript && document.currentScript.src || document.baseURI : new (typeof URL !== 'undefined' ? URL : require('ur'+'l').URL)('file:' + __filename).href));
 
-})));
+}));
diff --git a/test/form/samples/import-named-exported-global-with-alias/_expected/iife.js b/test/form/samples/import-named-exported-global-with-alias/_expected/iife.js
index f3d1016ed3e..43ef5426880 100644
--- a/test/form/samples/import-named-exported-global-with-alias/_expected/iife.js
+++ b/test/form/samples/import-named-exported-global-with-alias/_expected/iife.js
@@ -3,4 +3,4 @@
 
 
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/import-named-exported-global-with-alias/_expected/umd.js b/test/form/samples/import-named-exported-global-with-alias/_expected/umd.js
index d561e69c33b..a12a1990f01 100644
--- a/test/form/samples/import-named-exported-global-with-alias/_expected/umd.js
+++ b/test/form/samples/import-named-exported-global-with-alias/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/import-namespace/_expected/umd.js b/test/form/samples/import-namespace/_expected/umd.js
index 46ba424f126..568625e07eb 100644
--- a/test/form/samples/import-namespace/_expected/umd.js
+++ b/test/form/samples/import-namespace/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('foo'), require('bar')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['foo', 'bar'], factory) :
-	(factory(global.foo,global.bar));
-}(this, (function (foo,bar) { 'use strict';
+	factory(global.foo,global.bar);
+}(function (foo,bar) { 'use strict';
 
 	foo.x();
 	console.log(bar);
 
-})));
+}));
diff --git a/test/form/samples/import-specifier-deshadowing/_expected/umd.js b/test/form/samples/import-specifier-deshadowing/_expected/umd.js
index 23ef3183129..f7d2c2fddef 100644
--- a/test/form/samples/import-specifier-deshadowing/_expected/umd.js
+++ b/test/form/samples/import-specifier-deshadowing/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('react-sticky')) :
 	typeof define === 'function' && define.amd ? define(['react-sticky'], factory) :
-	(global.Sticky = factory(global.reactSticky));
-}(this, (function (reactSticky) { 'use strict';
+	global.Sticky = factory(global.reactSticky);
+}(typeof self !== 'undefined' ? self : this, function (reactSticky) { 'use strict';
 
 	var Sticky = function () {
 		function Sticky() {}
@@ -14,4 +14,4 @@
 
 	return Sticky;
 
-})));
+}));
diff --git a/test/form/samples/includes-all-namespace-declarations/_expected/iife.js b/test/form/samples/includes-all-namespace-declarations/_expected/iife.js
index f3d1016ed3e..43ef5426880 100644
--- a/test/form/samples/includes-all-namespace-declarations/_expected/iife.js
+++ b/test/form/samples/includes-all-namespace-declarations/_expected/iife.js
@@ -3,4 +3,4 @@
 
 
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/includes-all-namespace-declarations/_expected/umd.js b/test/form/samples/includes-all-namespace-declarations/_expected/umd.js
index d561e69c33b..a12a1990f01 100644
--- a/test/form/samples/includes-all-namespace-declarations/_expected/umd.js
+++ b/test/form/samples/includes-all-namespace-declarations/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/indent-false/_expected/umd.js b/test/form/samples/indent-false/_expected/umd.js
index fcd04052aae..c564f5c006f 100644
--- a/test/form/samples/indent-false/_expected/umd.js
+++ b/test/form/samples/indent-false/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 typeof define === 'function' && define.amd ? define(factory) :
-(global.foo = factory());
-}(this, (function () { 'use strict';
+global.foo = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 function foo () {
 	console.log( 'not indented' );
@@ -10,4 +10,4 @@ function foo () {
 
 return foo;
 
-})));
+}));
diff --git a/test/form/samples/indent-spaces/_expected/umd.js b/test/form/samples/indent-spaces/_expected/umd.js
index 86fd887037e..ea02460b08e 100644
--- a/test/form/samples/indent-spaces/_expected/umd.js
+++ b/test/form/samples/indent-spaces/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
-  (global.foo = factory());
-}(this, (function () { 'use strict';
+  global.foo = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
   function foo () {
   	console.log( 'indented with tabs' );
@@ -10,4 +10,4 @@
 
   return foo;
 
-})));
+}));
diff --git a/test/form/samples/indent-true-spaces/_expected/umd.js b/test/form/samples/indent-true-spaces/_expected/umd.js
index 51032c8e3df..61c18bbbeaf 100644
--- a/test/form/samples/indent-true-spaces/_expected/umd.js
+++ b/test/form/samples/indent-true-spaces/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
-  (global.foo = factory());
-}(this, (function () { 'use strict';
+  global.foo = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
   function foo () {
     console.log( 'indented with spaces' );
@@ -10,4 +10,4 @@
 
   return foo;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/indent-true/_expected/umd.js b/test/form/samples/indent-true/_expected/umd.js
index 786d82b1c53..6c5faf54c30 100644
--- a/test/form/samples/indent-true/_expected/umd.js
+++ b/test/form/samples/indent-true/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.foo = factory());
-}(this, (function () { 'use strict';
+	global.foo = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	function foo () {
 		console.log( 'indented with tabs' );
@@ -10,4 +10,4 @@
 
 	return foo;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/inlined-treeshaken-dynamic-import/_expected/umd.js b/test/form/samples/inlined-treeshaken-dynamic-import/_expected/umd.js
index 41674034421..4768f1d9737 100644
--- a/test/form/samples/inlined-treeshaken-dynamic-import/_expected/umd.js
+++ b/test/form/samples/inlined-treeshaken-dynamic-import/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log('main');
 
-})));
+}));
diff --git a/test/form/samples/internal-conflict-resolution/_expected/umd.js b/test/form/samples/internal-conflict-resolution/_expected/umd.js
index 0a33759ffbf..e655595997d 100644
--- a/test/form/samples/internal-conflict-resolution/_expected/umd.js
+++ b/test/form/samples/internal-conflict-resolution/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var bar = 42;
 
@@ -16,4 +15,4 @@
 
 	bar$1();
 
-})));
+}));
diff --git a/test/form/samples/interop-false-reexport/_expected/umd.js b/test/form/samples/interop-false-reexport/_expected/umd.js
index bd66349d63b..efcc53aacf1 100644
--- a/test/form/samples/interop-false-reexport/_expected/umd.js
+++ b/test/form/samples/interop-false-reexport/_expected/umd.js
@@ -1,12 +1,12 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'external'], factory) :
-	(factory((global.foo = {}),global.external));
-}(this, (function (exports,external) { 'use strict';
+	factory(global.foo = {},global.external);
+}(typeof self !== 'undefined' ? self : this, function (exports,external) { 'use strict';
 
 	exports.q = external.p;
 	exports.p = external.default;
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/interop-false/_expected/umd.js b/test/form/samples/interop-false/_expected/umd.js
index 5c9be13a166..14f9a630abb 100644
--- a/test/form/samples/interop-false/_expected/umd.js
+++ b/test/form/samples/interop-false/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('core/view')) :
 	typeof define === 'function' && define.amd ? define(['core/view'], factory) :
-	(global.foo = factory(global.View));
-}(this, (function (View) { 'use strict';
+	global.foo = factory(global.View);
+}(typeof self !== 'undefined' ? self : this, function (View) { 'use strict';
 
 	var main = View.extend({});
 
 	return main;
 
-})));
+}));
diff --git a/test/form/samples/intro-and-outro/_expected/umd.js b/test/form/samples/intro-and-outro/_expected/umd.js
index e0b95025922..020f98301c3 100644
--- a/test/form/samples/intro-and-outro/_expected/umd.js
+++ b/test/form/samples/intro-and-outro/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('external')) :
 	typeof define === 'function' && define.amd ? define(['external'], factory) :
-	(global.foo = factory(global.a));
-}(this, (function (a) { 'use strict';
+	global.foo = factory(global.a);
+}(typeof self !== 'undefined' ? self : this, function (a) { 'use strict';
 
 	/* this is an intro */
 
@@ -33,4 +33,4 @@
 
 	// outro 4
 
-})));
+}));
diff --git a/test/form/samples/json-parse-is-not-pure/_expected/umd.js b/test/form/samples/json-parse-is-not-pure/_expected/umd.js
index 118869fed3b..57a8a3f5324 100644
--- a/test/form/samples/json-parse-is-not-pure/_expected/umd.js
+++ b/test/form/samples/json-parse-is-not-pure/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var main = (input) => {
 		try {
@@ -15,4 +15,4 @@
 
 	return main;
 
-})));
+}));
diff --git a/test/form/samples/json-stringify-is-not-pure/_expected/umd.js b/test/form/samples/json-stringify-is-not-pure/_expected/umd.js
index a6f5a62b21d..ff2c48c5b2a 100644
--- a/test/form/samples/json-stringify-is-not-pure/_expected/umd.js
+++ b/test/form/samples/json-stringify-is-not-pure/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var main = (input) => {
 		try {
@@ -15,4 +15,4 @@
 
 	return main;
 
-})));
+}));
diff --git a/test/form/samples/keep-property-access-side-effects/_expected/umd.js b/test/form/samples/keep-property-access-side-effects/_expected/umd.js
index 2bd30dc3ee2..cc59d657d23 100644
--- a/test/form/samples/keep-property-access-side-effects/_expected/umd.js
+++ b/test/form/samples/keep-property-access-side-effects/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const getter = {
 		get foo () {
@@ -21,4 +20,4 @@
 
 	const foo4 = globalVar.unknownProperty;
 
-})));
+}));
diff --git a/test/form/samples/labeled-break-statements/_expected/umd.js b/test/form/samples/labeled-break-statements/_expected/umd.js
index 92a0f2c22c7..76d6b284270 100644
--- a/test/form/samples/labeled-break-statements/_expected/umd.js
+++ b/test/form/samples/labeled-break-statements/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const condition = Math.random() > 0.5;
 
@@ -32,4 +31,4 @@
 			console.log( 'effect' );
 		}
 
-})));
+}));
diff --git a/test/form/samples/mjs/_expected/umd.js b/test/form/samples/mjs/_expected/umd.js
index 5b326b03877..da70546bfe0 100644
--- a/test/form/samples/mjs/_expected/umd.js
+++ b/test/form/samples/mjs/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.myBundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.myBundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var dep = 'js';
 
@@ -13,4 +13,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/module-name-scoped-package/_expected/iife.js b/test/form/samples/module-name-scoped-package/_expected/iife.js
index 7445d49b396..487880286bc 100644
--- a/test/form/samples/module-name-scoped-package/_expected/iife.js
+++ b/test/form/samples/module-name-scoped-package/_expected/iife.js
@@ -5,4 +5,4 @@
 
 	exports.foo = foo;
 
-}((this['@scoped/npm-package'] = this['@scoped/npm-package'] || {})));
+}(this['@scoped/npm-package'] = this['@scoped/npm-package'] || {}));
diff --git a/test/form/samples/module-name-scoped-package/_expected/umd.js b/test/form/samples/module-name-scoped-package/_expected/umd.js
index 33822192a14..55824515283 100644
--- a/test/form/samples/module-name-scoped-package/_expected/umd.js
+++ b/test/form/samples/module-name-scoped-package/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global['@scoped/npm-package'] = global['@scoped/npm-package'] || {})));
-}(this, (function (exports) { 'use strict';
+	factory(global['@scoped/npm-package'] = global['@scoped/npm-package'] || {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	let foo = 'foo';
 
@@ -10,4 +10,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/module-name-wat/_expected/umd.js b/test/form/samples/module-name-wat/_expected/umd.js
index 7047ab86e19..83d1765b102 100644
--- a/test/form/samples/module-name-wat/_expected/umd.js
+++ b/test/form/samples/module-name-wat/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.foo = global.foo || {}, global.foo['@scoped/npm-package'] = global.foo['@scoped/npm-package'] || {}, global.foo['@scoped/npm-package'].bar = global.foo['@scoped/npm-package'].bar || {}, global.foo['@scoped/npm-package'].bar['why-would-you-do-this'] = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.foo = global.foo || {}, global.foo['@scoped/npm-package'] = global.foo['@scoped/npm-package'] || {}, global.foo['@scoped/npm-package'].bar = global.foo['@scoped/npm-package'].bar || {}, global.foo['@scoped/npm-package'].bar['why-would-you-do-this'] = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	let foo = 'foo';
 
@@ -10,4 +10,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/module-name-with-dashes/_expected/iife.js b/test/form/samples/module-name-with-dashes/_expected/iife.js
index 5eb10627ee3..329396135ac 100644
--- a/test/form/samples/module-name-with-dashes/_expected/iife.js
+++ b/test/form/samples/module-name-with-dashes/_expected/iife.js
@@ -5,4 +5,4 @@
 
 	exports.foo = foo;
 
-}((this['module-name-with-dashes'] = this['module-name-with-dashes'] || {})));
+}(this['module-name-with-dashes'] = this['module-name-with-dashes'] || {}));
diff --git a/test/form/samples/module-name-with-dashes/_expected/umd.js b/test/form/samples/module-name-with-dashes/_expected/umd.js
index 8d90ff63891..eeaba12484c 100644
--- a/test/form/samples/module-name-with-dashes/_expected/umd.js
+++ b/test/form/samples/module-name-with-dashes/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global['module-name-with-dashes'] = global['module-name-with-dashes'] || {})));
-}(this, (function (exports) { 'use strict';
+	factory(global['module-name-with-dashes'] = global['module-name-with-dashes'] || {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	let foo = 'foo';
 
@@ -10,4 +10,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/multiple-exports/_expected/umd.js b/test/form/samples/multiple-exports/_expected/umd.js
index e609ef4ee4a..862d7fbbc3a 100644
--- a/test/form/samples/multiple-exports/_expected/umd.js
+++ b/test/form/samples/multiple-exports/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.myBundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.myBundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var foo = 1;
 	var bar = 2;
@@ -12,4 +12,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/mutate-logical-expression/_expected/umd.js b/test/form/samples/mutate-logical-expression/_expected/umd.js
index 60de180f496..8834b79b8a9 100644
--- a/test/form/samples/mutate-logical-expression/_expected/umd.js
+++ b/test/form/samples/mutate-logical-expression/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.bundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.bundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var aExp = {};
 	var logicalAExp = aExp || {};
@@ -22,4 +22,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/mutations-in-imports/_expected/umd.js b/test/form/samples/mutations-in-imports/_expected/umd.js
index a8aec2a3f1a..8d62b385a06 100644
--- a/test/form/samples/mutations-in-imports/_expected/umd.js
+++ b/test/form/samples/mutations-in-imports/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const x = { a: { b: () => {} } };
 	const y = { a: x.a };
@@ -22,4 +21,4 @@
 	y$2.a.b = () => console.log( 'effect' );
 	x$2.a.b();
 
-})));
+}));
diff --git a/test/form/samples/namespace-import-reexport/_expected/umd.js b/test/form/samples/namespace-import-reexport/_expected/umd.js
index 6561693b3a0..6391f9cafba 100644
--- a/test/form/samples/namespace-import-reexport/_expected/umd.js
+++ b/test/form/samples/namespace-import-reexport/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external-package')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'external-package'], factory) :
-	(factory((global.iife = {}),global.externalPackage));
-}(this, (function (exports,externalPackage) { 'use strict';
+	factory(global.iife = {},global.externalPackage);
+}(typeof self !== 'undefined' ? self : this, function (exports,externalPackage) { 'use strict';
 
 	exports.ext = externalPackage;
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/namespace-optimization-b/_expected/umd.js b/test/form/samples/namespace-optimization-b/_expected/umd.js
index a34b4e2af71..1805eef8ad7 100644
--- a/test/form/samples/namespace-optimization-b/_expected/umd.js
+++ b/test/form/samples/namespace-optimization-b/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo () {
 		console.log( 'foo' );
@@ -18,4 +17,4 @@
 
 	a();
 
-})));
+}));
diff --git a/test/form/samples/namespace-optimization-computed-string/_expected/umd.js b/test/form/samples/namespace-optimization-computed-string/_expected/umd.js
index 74276855454..55d948fb408 100644
--- a/test/form/samples/namespace-optimization-computed-string/_expected/umd.js
+++ b/test/form/samples/namespace-optimization-computed-string/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function a () {
 		console.log('effect');
@@ -10,4 +9,4 @@
 
 	a();
 
-})));
+}));
diff --git a/test/form/samples/namespace-optimization/_expected/umd.js b/test/form/samples/namespace-optimization/_expected/umd.js
index bf379efba2c..86591143883 100644
--- a/test/form/samples/namespace-optimization/_expected/umd.js
+++ b/test/form/samples/namespace-optimization/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function a () {}
 
 	console.log( a() );
 
-})));
+}));
diff --git a/test/form/samples/namespace-self-import/_expected/umd.js b/test/form/samples/namespace-self-import/_expected/umd.js
index 905f086ebdc..73992752527 100644
--- a/test/form/samples/namespace-self-import/_expected/umd.js
+++ b/test/form/samples/namespace-self-import/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.iife = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.iife = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var self = /*#__PURE__*/Object.freeze({
 		get p () { return p$$1; }
@@ -16,4 +16,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/namespace-tostringtag/_expected/umd.js b/test/form/samples/namespace-tostringtag/_expected/umd.js
index 1b3faafbc07..7866d6f9341 100644
--- a/test/form/samples/namespace-tostringtag/_expected/umd.js
+++ b/test/form/samples/namespace-tostringtag/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.iife = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.iife = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var self = {
 		get p () { return p$$1; }
@@ -21,4 +21,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/namespaced-default-exports/_expected/umd.js b/test/form/samples/namespaced-default-exports/_expected/umd.js
index 9bc50962d4d..7ae2d849d5e 100644
--- a/test/form/samples/namespaced-default-exports/_expected/umd.js
+++ b/test/form/samples/namespaced-default-exports/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.foo = global.foo || {}, global.foo.bar = global.foo.bar || {}, global.foo.bar.baz = factory());
-}(this, (function () { 'use strict';
+	global.foo = global.foo || {}, global.foo.bar = global.foo.bar || {}, global.foo.bar.baz = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/namespaced-named-exports/_expected/umd.js b/test/form/samples/namespaced-named-exports/_expected/umd.js
index 0c74c30b021..79785ba236f 100644
--- a/test/form/samples/namespaced-named-exports/_expected/umd.js
+++ b/test/form/samples/namespaced-named-exports/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.foo = global.foo || {}, global.foo.bar = global.foo.bar || {}, global.foo.bar.baz = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.foo = global.foo || {}, global.foo.bar = global.foo.bar || {}, global.foo.bar.baz = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var answer = 42;
 
@@ -10,4 +10,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/nested-member-access/_expected/umd.js b/test/form/samples/nested-member-access/_expected/umd.js
index d41e21ee0f3..145dd33b8e0 100644
--- a/test/form/samples/nested-member-access/_expected/umd.js
+++ b/test/form/samples/nested-member-access/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const retained1 = {};
 	const retainedResult1 = retained1.foo.bar;
@@ -28,4 +27,4 @@
 
 	const retained8 = globalVar.x;
 
-})));
+}));
diff --git a/test/form/samples/nested-this-expressions/_expected/umd.js b/test/form/samples/nested-this-expressions/_expected/umd.js
index f5919e0a581..0abe56dcd41 100644
--- a/test/form/samples/nested-this-expressions/_expected/umd.js
+++ b/test/form/samples/nested-this-expressions/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function mutateThis () {
 		this.x = 1;
@@ -30,4 +29,4 @@
 	}
 	const c = new CallSelfWithoutNew();
 
-})));
+}));
diff --git a/test/form/samples/nested-tree-shaking/_expected/umd.js b/test/form/samples/nested-tree-shaking/_expected/umd.js
index 4544b92a880..e4de26fc806 100644
--- a/test/form/samples/nested-tree-shaking/_expected/umd.js
+++ b/test/form/samples/nested-tree-shaking/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function withEffects() {
 		console.log('effect');
@@ -13,4 +12,4 @@
 		withEffects();
 	}
 
-})));
+}));
diff --git a/test/form/samples/no-imports-or-exports/_expected/umd.js b/test/form/samples/no-imports-or-exports/_expected/umd.js
index 2a478bf69b3..6cffa2b419d 100644
--- a/test/form/samples/no-imports-or-exports/_expected/umd.js
+++ b/test/form/samples/no-imports-or-exports/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 'this is it' );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/no-treeshake-conflict/_expected/umd.js b/test/form/samples/no-treeshake-conflict/_expected/umd.js
index 2ccb354b8fd..0b951d588b0 100644
--- a/test/form/samples/no-treeshake-conflict/_expected/umd.js
+++ b/test/form/samples/no-treeshake-conflict/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const other = {
 		something: 'here'
@@ -12,4 +11,4 @@
 		somethingElse: 'here'
 	};
 
-})));
+}));
diff --git a/test/form/samples/no-treeshake/_expected/umd.js b/test/form/samples/no-treeshake/_expected/umd.js
index 92caa73a32f..5ddad60ade1 100644
--- a/test/form/samples/no-treeshake/_expected/umd.js
+++ b/test/form/samples/no-treeshake/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'external'], factory) :
-	(factory((global.stirred = {}),global.external));
-}(this, (function (exports,external) { 'use strict';
+	factory(global.stirred = {},global.external);
+}(typeof self !== 'undefined' ? self : this, function (exports,external) { 'use strict';
 
 	var foo = 13;
 
@@ -41,4 +41,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/non-empty-block-statement/_expected/umd.js b/test/form/samples/non-empty-block-statement/_expected/umd.js
index 9015af252b1..c7575d2a2a6 100644
--- a/test/form/samples/non-empty-block-statement/_expected/umd.js
+++ b/test/form/samples/non-empty-block-statement/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	console.log( 1 );
 	{
@@ -10,4 +9,4 @@
 	}
 	console.log( tmp );
 
-})));
+}));
diff --git a/test/form/samples/object-destructuring-default-values/_expected/iife.js b/test/form/samples/object-destructuring-default-values/_expected/iife.js
index fd22a666c2b..6923ccc809a 100644
--- a/test/form/samples/object-destructuring-default-values/_expected/iife.js
+++ b/test/form/samples/object-destructuring-default-values/_expected/iife.js
@@ -7,4 +7,4 @@
 	const [ d = b ] = [];
 	console.log(c, d);
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/object-destructuring-default-values/_expected/umd.js b/test/form/samples/object-destructuring-default-values/_expected/umd.js
index 3a1aeb7e9f7..2314f9597d0 100644
--- a/test/form/samples/object-destructuring-default-values/_expected/umd.js
+++ b/test/form/samples/object-destructuring-default-values/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const a = 1;
 	const b = 2;
@@ -10,4 +9,4 @@
 	const [ d = b ] = [];
 	console.log(c, d);
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/object-literal-property-overwrites/_expected/umd.js b/test/form/samples/object-literal-property-overwrites/_expected/umd.js
index 946b2f08a25..61142209b9d 100644
--- a/test/form/samples/object-literal-property-overwrites/_expected/umd.js
+++ b/test/form/samples/object-literal-property-overwrites/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const retained1 = {
 		foo: () => {},
@@ -42,4 +41,4 @@
 	};
 	retained6.bar.baz = 1;
 
-})));
+}));
diff --git a/test/form/samples/output-named-library/_expected/umd.js b/test/form/samples/output-named-library/_expected/umd.js
index 3f1d36d58d9..16417cbaf4d 100644
--- a/test/form/samples/output-named-library/_expected/umd.js
+++ b/test/form/samples/output-named-library/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.libraryName = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.libraryName = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	const valueOnLib = 42;
 
@@ -10,4 +10,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/paths-function/_expected/iife.js b/test/form/samples/paths-function/_expected/iife.js
index 65e77f659e4..e1c212ba377 100644
--- a/test/form/samples/paths-function/_expected/iife.js
+++ b/test/form/samples/paths-function/_expected/iife.js
@@ -5,4 +5,4 @@
 
 	assert.equal( foo, 42 );
 
-}(foo));
\ No newline at end of file
+}(foo));
diff --git a/test/form/samples/paths-function/_expected/umd.js b/test/form/samples/paths-function/_expected/umd.js
index 8cbe03c42ee..20c4ea55510 100644
--- a/test/form/samples/paths-function/_expected/umd.js
+++ b/test/form/samples/paths-function/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('https://unpkg.com/foo')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['https://unpkg.com/foo'], factory) :
-	(factory(global.foo));
-}(this, (function (foo) { 'use strict';
+	factory(global.foo);
+}(function (foo) { 'use strict';
 
 	foo = foo && foo.hasOwnProperty('default') ? foo['default'] : foo;
 
 	assert.equal( foo, 42 );
 
-})));
+}));
diff --git a/test/form/samples/paths-relative/_expected/iife.js b/test/form/samples/paths-relative/_expected/iife.js
index 65e77f659e4..e1c212ba377 100644
--- a/test/form/samples/paths-relative/_expected/iife.js
+++ b/test/form/samples/paths-relative/_expected/iife.js
@@ -5,4 +5,4 @@
 
 	assert.equal( foo, 42 );
 
-}(foo));
\ No newline at end of file
+}(foo));
diff --git a/test/form/samples/paths-relative/_expected/umd.js b/test/form/samples/paths-relative/_expected/umd.js
index e9f884b5226..f5c03f855a4 100644
--- a/test/form/samples/paths-relative/_expected/umd.js
+++ b/test/form/samples/paths-relative/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../foo')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['../foo'], factory) :
-	(factory(global.foo));
-}(this, (function (foo) { 'use strict';
+	factory(global.foo);
+}(function (foo) { 'use strict';
 
 	foo = foo && foo.hasOwnProperty('default') ? foo['default'] : foo;
 
 	assert.equal( foo, 42 );
 
-})));
+}));
diff --git a/test/form/samples/paths/_expected/iife.js b/test/form/samples/paths/_expected/iife.js
index 65e77f659e4..e1c212ba377 100644
--- a/test/form/samples/paths/_expected/iife.js
+++ b/test/form/samples/paths/_expected/iife.js
@@ -5,4 +5,4 @@
 
 	assert.equal( foo, 42 );
 
-}(foo));
\ No newline at end of file
+}(foo));
diff --git a/test/form/samples/paths/_expected/umd.js b/test/form/samples/paths/_expected/umd.js
index 8cbe03c42ee..20c4ea55510 100644
--- a/test/form/samples/paths/_expected/umd.js
+++ b/test/form/samples/paths/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('https://unpkg.com/foo')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['https://unpkg.com/foo'], factory) :
-	(factory(global.foo));
-}(this, (function (foo) { 'use strict';
+	factory(global.foo);
+}(function (foo) { 'use strict';
 
 	foo = foo && foo.hasOwnProperty('default') ? foo['default'] : foo;
 
 	assert.equal( foo, 42 );
 
-})));
+}));
diff --git a/test/form/samples/pattern-assignments/_expected/umd.js b/test/form/samples/pattern-assignments/_expected/umd.js
index 03478f68746..7667b225ad4 100644
--- a/test/form/samples/pattern-assignments/_expected/umd.js
+++ b/test/form/samples/pattern-assignments/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.bundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.bundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var effect = () => console.log( 'effect' );
 
@@ -45,4 +45,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/prefer-const/_expected/umd.js b/test/form/samples/prefer-const/_expected/umd.js
index 2c5e1d2abfb..12bbd8f6e38 100644
--- a/test/form/samples/prefer-const/_expected/umd.js
+++ b/test/form/samples/prefer-const/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('other')) :
 	typeof define === 'function' && define.amd ? define(['other'], factory) :
-	(global.myBundle = factory(global.other));
-}(this, (function (other) { 'use strict';
+	global.myBundle = factory(global.other);
+}(typeof self !== 'undefined' ? self : this, function (other) { 'use strict';
 
 	const a = 1;
 	const b = 2;
@@ -19,4 +19,4 @@
 
 	return main;
 
-})));
+}));
diff --git a/test/form/samples/preserve-debugger/_expected/umd.js b/test/form/samples/preserve-debugger/_expected/umd.js
index a6ca6352643..f2cc9a10880 100644
--- a/test/form/samples/preserve-debugger/_expected/umd.js
+++ b/test/form/samples/preserve-debugger/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	before();
 	debugger;
 	after();
 
-})));
+}));
diff --git a/test/form/samples/preserves-comments-after-imports/_expected/umd.js b/test/form/samples/preserves-comments-after-imports/_expected/umd.js
index 628541f3e59..120edb987e9 100644
--- a/test/form/samples/preserves-comments-after-imports/_expected/umd.js
+++ b/test/form/samples/preserves-comments-after-imports/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.myBundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.myBundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	/** A comment for a number */
 	var number = 5;
@@ -14,4 +14,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/promises/_expected/umd.js b/test/form/samples/promises/_expected/umd.js
index 786a3fe6672..5dd631f3a82 100644
--- a/test/form/samples/promises/_expected/umd.js
+++ b/test/form/samples/promises/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.bundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.bundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	const p1 = new Promise( () => {
 		console.log( 'fire & forget' );
@@ -22,4 +22,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/proper-this-context/_expected/umd.js b/test/form/samples/proper-this-context/_expected/umd.js
index 4ec019cc050..27c951298fa 100644
--- a/test/form/samples/proper-this-context/_expected/umd.js
+++ b/test/form/samples/proper-this-context/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const mutateThis = () => {
 		undefined.x = 1;
@@ -14,4 +13,4 @@
 
 	const test = new Test();
 
-})));
+}));
diff --git a/test/form/samples/prototype-functions/_expected/umd.js b/test/form/samples/prototype-functions/_expected/umd.js
index baca4088c9e..10a7bc063af 100644
--- a/test/form/samples/prototype-functions/_expected/umd.js
+++ b/test/form/samples/prototype-functions/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function Foo () {
 		this.doIt();
@@ -16,4 +15,4 @@
 
 	const foo = new Foo();
 
-})));
+}));
diff --git a/test/form/samples/prune-pure-unused-import-array/_expected/umd.js b/test/form/samples/prune-pure-unused-import-array/_expected/umd.js
index 8468e4b0d8c..b8ded053719 100644
--- a/test/form/samples/prune-pure-unused-import-array/_expected/umd.js
+++ b/test/form/samples/prune-pure-unused-import-array/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('other')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['other'], factory) :
-	(factory(global.other));
-}(this, (function (other) { 'use strict';
+	factory(global.other);
+}(function (other) { 'use strict';
 
 
 
-})));
+}));
diff --git a/test/form/samples/prune-pure-unused-import-function/_expected/umd.js b/test/form/samples/prune-pure-unused-import-function/_expected/umd.js
index 8468e4b0d8c..b8ded053719 100644
--- a/test/form/samples/prune-pure-unused-import-function/_expected/umd.js
+++ b/test/form/samples/prune-pure-unused-import-function/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('other')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['other'], factory) :
-	(factory(global.other));
-}(this, (function (other) { 'use strict';
+	factory(global.other);
+}(function (other) { 'use strict';
 
 
 
-})));
+}));
diff --git a/test/form/samples/prune-pure-unused-import/_expected/umd.js b/test/form/samples/prune-pure-unused-import/_expected/umd.js
index 07ce27e42f1..a12a1990f01 100644
--- a/test/form/samples/prune-pure-unused-import/_expected/umd.js
+++ b/test/form/samples/prune-pure-unused-import/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 
 
-})));
+}));
diff --git a/test/form/samples/re-export-aliasing/_expected/umd.js b/test/form/samples/re-export-aliasing/_expected/umd.js
index 663479385ab..5077fe401b9 100644
--- a/test/form/samples/re-export-aliasing/_expected/umd.js
+++ b/test/form/samples/re-export-aliasing/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('d')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'd'], factory) :
-	(factory((global.reexportsAliasingExternal = {}),global.d));
-}(this, (function (exports,d) { 'use strict';
+	factory(global.reexportsAliasingExternal = {},global.d);
+}(typeof self !== 'undefined' ? self : this, function (exports,d) { 'use strict';
 
 	exports.b = d.d;
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/re-export-default-external/_expected/umd.js b/test/form/samples/re-export-default-external/_expected/umd.js
index dbfb7878c0d..f9aba91c943 100644
--- a/test/form/samples/re-export-default-external/_expected/umd.js
+++ b/test/form/samples/re-export-default-external/_expected/umd.js
@@ -1,9 +1,9 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('external')) :
 	typeof define === 'function' && define.amd ? define(['external'], factory) :
-	(global.reexportsDefaultExternal = factory(global.external));
-}(this, (function (external) { 'use strict';
+	global.reexportsDefaultExternal = factory(global.external);
+}(typeof self !== 'undefined' ? self : this, function (external) { 'use strict';
 
 	return external.objAlias;
 
-})));
+}));
diff --git a/test/form/samples/reassigned-exported-functions-and-classes/_expected/umd.js b/test/form/samples/reassigned-exported-functions-and-classes/_expected/umd.js
index fb722183a24..2fe71ce4d45 100644
--- a/test/form/samples/reassigned-exported-functions-and-classes/_expected/umd.js
+++ b/test/form/samples/reassigned-exported-functions-and-classes/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.bundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.bundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	function foo () {}
 	foo = 1;
@@ -15,4 +15,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/recursive-assignments/_expected/umd.js b/test/form/samples/recursive-assignments/_expected/umd.js
index c94ff4f0700..7427ebd686d 100644
--- a/test/form/samples/recursive-assignments/_expected/umd.js
+++ b/test/form/samples/recursive-assignments/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	let foo = () => function () {};
 	foo.value = foo;
@@ -16,4 +15,4 @@
 	new (foo())();
 	foo.bar = 1;
 
-})));
+}));
diff --git a/test/form/samples/recursive-calls/_expected/umd.js b/test/form/samples/recursive-calls/_expected/umd.js
index e00ee3161cc..3ffa3a9f382 100644
--- a/test/form/samples/recursive-calls/_expected/umd.js
+++ b/test/form/samples/recursive-calls/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const retained1 = () => globalVar ? retained1() : console.log( 'effect' );
 	retained1();
@@ -44,4 +43,4 @@
 	};
 	retained8.x.y();
 
-})));
+}));
diff --git a/test/form/samples/redeclarations/_expected/umd.js b/test/form/samples/redeclarations/_expected/umd.js
index 2f083cfa3f3..04989a2b0c7 100644
--- a/test/form/samples/redeclarations/_expected/umd.js
+++ b/test/form/samples/redeclarations/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var foo = () => {};
 
@@ -25,4 +24,4 @@
 
 	baz();
 
-})));
+}));
diff --git a/test/form/samples/reexport-star-deshadow/_expected/umd.js b/test/form/samples/reexport-star-deshadow/_expected/umd.js
index d2c4449203d..72d69ee592d 100644
--- a/test/form/samples/reexport-star-deshadow/_expected/umd.js
+++ b/test/form/samples/reexport-star-deshadow/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo() { return true; }
 
@@ -12,4 +11,4 @@
 
 	console.log(baz());
 
-})));
+}));
diff --git a/test/form/samples/reexports-from-external/_expected/umd.js b/test/form/samples/reexports-from-external/_expected/umd.js
index c4737166810..6632c2c0dbd 100644
--- a/test/form/samples/reexports-from-external/_expected/umd.js
+++ b/test/form/samples/reexports-from-external/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'external'], factory) :
-	(factory((global.myBundle = {}),global.external));
-}(this, (function (exports,external) { 'use strict';
+	factory(global.myBundle = {},global.external);
+}(typeof self !== 'undefined' ? self : this, function (exports,external) { 'use strict';
 
 	Object.keys(external).forEach(function (key) { exports[key] = external[key]; });
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/reexports-name-from-external/_expected/umd.js b/test/form/samples/reexports-name-from-external/_expected/umd.js
index 3ec9a961940..429d6fc7336 100644
--- a/test/form/samples/reexports-name-from-external/_expected/umd.js
+++ b/test/form/samples/reexports-name-from-external/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'external'], factory) :
-	(factory((global.myBundle = {}),global.external));
-}(this, (function (exports,external) { 'use strict';
+	factory(global.myBundle = {},global.external);
+}(typeof self !== 'undefined' ? self : this, function (exports,external) { 'use strict';
 
 	exports.foo = external.foo;
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/relative-external-with-global/_expected/umd.js b/test/form/samples/relative-external-with-global/_expected/umd.js
index 7e610c2a5aa..a0b7b8ab533 100644
--- a/test/form/samples/relative-external-with-global/_expected/umd.js
+++ b/test/form/samples/relative-external-with-global/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('./lib/throttle.js')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['./lib/throttle.js'], factory) :
-	(factory(global.Lib.throttle));
-}(this, (function (throttle) { 'use strict';
+	factory(global.Lib.throttle);
+}(function (throttle) { 'use strict';
 
 	throttle = throttle && throttle.hasOwnProperty('default') ? throttle['default'] : throttle;
 
@@ -12,4 +11,4 @@
 
 	window.addEventListener( 'mousemove', throttle );
 
-})));
+}));
diff --git a/test/form/samples/removes-existing-sourcemap-comments/_expected/umd.js b/test/form/samples/removes-existing-sourcemap-comments/_expected/umd.js
index 0e63d702514..83fff4c78f5 100644
--- a/test/form/samples/removes-existing-sourcemap-comments/_expected/umd.js
+++ b/test/form/samples/removes-existing-sourcemap-comments/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo () {
 		return 42;
@@ -14,4 +13,4 @@
 
 	console.log( foo(str) );
 
-})));
+}));
diff --git a/test/form/samples/removes-unused-babel-helpers/_expected/umd.js b/test/form/samples/removes-unused-babel-helpers/_expected/umd.js
index 07ce27e42f1..a12a1990f01 100644
--- a/test/form/samples/removes-unused-babel-helpers/_expected/umd.js
+++ b/test/form/samples/removes-unused-babel-helpers/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 
 
-})));
+}));
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/iife.js b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/iife.js
index 0cf4bad6fbc..5346f95c1cf 100644
--- a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/iife.js
+++ b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/iife.js
@@ -1,3 +1,3 @@
 /* first plugin */
 /* second plugin */
-//# sourceMappingURL=iife.js.map
\ No newline at end of file
+//# sourceMappingURL=iife.js.map
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/umd.js b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/umd.js
index d9f21ea81f9..e683d14427a 100644
--- a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/umd.js
+++ b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/umd.js
@@ -1,3 +1,3 @@
 /* first plugin */
 /* second plugin */
-//# sourceMappingURL=umd.js.map
\ No newline at end of file
+//# sourceMappingURL=umd.js.map
diff --git a/test/form/samples/render-chunk-plugin/_expected/iife.js b/test/form/samples/render-chunk-plugin/_expected/iife.js
index f783236effa..6dd9ebb24b6 100644
--- a/test/form/samples/render-chunk-plugin/_expected/iife.js
+++ b/test/form/samples/render-chunk-plugin/_expected/iife.js
@@ -1,2 +1,2 @@
 /* first plugin */
-/* second plugin */
\ No newline at end of file
+/* second plugin */
diff --git a/test/form/samples/render-chunk-plugin/_expected/umd.js b/test/form/samples/render-chunk-plugin/_expected/umd.js
index f783236effa..6dd9ebb24b6 100644
--- a/test/form/samples/render-chunk-plugin/_expected/umd.js
+++ b/test/form/samples/render-chunk-plugin/_expected/umd.js
@@ -1,2 +1,2 @@
 /* first plugin */
-/* second plugin */
\ No newline at end of file
+/* second plugin */
diff --git a/test/form/samples/render-declaration-semicolons/_expected/umd.js b/test/form/samples/render-declaration-semicolons/_expected/umd.js
index 6831a1588d6..3ab816fbc0e 100644
--- a/test/form/samples/render-declaration-semicolons/_expected/umd.js
+++ b/test/form/samples/render-declaration-semicolons/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.bundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.bundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var a, b;
 	console.log(a, b);
@@ -35,4 +35,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/render-named-export-declarations/_expected/umd.js b/test/form/samples/render-named-export-declarations/_expected/umd.js
index 394da8eaad4..923cc86c20a 100644
--- a/test/form/samples/render-named-export-declarations/_expected/umd.js
+++ b/test/form/samples/render-named-export-declarations/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.bundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.bundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var aFoo;
 	exports.aBar = 2;
@@ -23,4 +23,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/render-removed-declarations/_expected/umd.js b/test/form/samples/render-removed-declarations/_expected/umd.js
index 2875c40099e..3079eee7974 100644
--- a/test/form/samples/render-removed-declarations/_expected/umd.js
+++ b/test/form/samples/render-removed-declarations/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
     typeof define === 'function' && define.amd ? define(factory) :
-    (factory());
-}(this, (function () { 'use strict';
+    factory();
+}(function () { 'use strict';
 
     // -> Middle removed
     var kept1 = 1, kept2 = 3;
@@ -60,4 +59,4 @@
 
     console.log( kept1, kept2 );
 
-})));
+}));
diff --git a/test/form/samples/render-removed-statements/_expected/umd.js b/test/form/samples/render-removed-statements/_expected/umd.js
index 4aaf0be6697..76956811294 100644
--- a/test/form/samples/render-removed-statements/_expected/umd.js
+++ b/test/form/samples/render-removed-statements/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	/* header retained */
 	 /* lead
@@ -64,4 +63,4 @@
 
 	/* footer retained */
 
-})));
+}));
diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js b/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js
index dd3067cd5a2..f1eb2833b98 100644
--- a/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js
+++ b/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'external'], factory) :
-	(factory((global.bundle = {}),global.myExternal));
-}(this, (function (exports,myExternal) { 'use strict';
+	factory(global.bundle = {},global.myExternal);
+}(typeof self !== 'undefined' ? self : this, function (exports,myExternal) { 'use strict';
 
 	myExternal = myExternal && myExternal.hasOwnProperty('default') ? myExternal['default'] : myExternal;
 
@@ -15,4 +15,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/self-calling-function-with-effects/_expected/iife.js b/test/form/samples/self-calling-function-with-effects/_expected/iife.js
index bb848ad1ecb..822b1c81610 100644
--- a/test/form/samples/self-calling-function-with-effects/_expected/iife.js
+++ b/test/form/samples/self-calling-function-with-effects/_expected/iife.js
@@ -18,4 +18,4 @@
 	foo( 10 );
 	bar( 10 );
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/self-calling-function-with-effects/_expected/umd.js b/test/form/samples/self-calling-function-with-effects/_expected/umd.js
index a9fd5b2a2d4..1ba67f36345 100644
--- a/test/form/samples/self-calling-function-with-effects/_expected/umd.js
+++ b/test/form/samples/self-calling-function-with-effects/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo ( x ) {
 		effect( x );
@@ -21,4 +20,4 @@
 	foo( 10 );
 	bar( 10 );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/self-calling-function/_expected/iife.js b/test/form/samples/self-calling-function/_expected/iife.js
index f3d1016ed3e..43ef5426880 100644
--- a/test/form/samples/self-calling-function/_expected/iife.js
+++ b/test/form/samples/self-calling-function/_expected/iife.js
@@ -3,4 +3,4 @@
 
 
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/self-calling-function/_expected/umd.js b/test/form/samples/self-calling-function/_expected/umd.js
index d561e69c33b..a12a1990f01 100644
--- a/test/form/samples/self-calling-function/_expected/umd.js
+++ b/test/form/samples/self-calling-function/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/self-contained-bundle/_expected/umd.js b/test/form/samples/self-contained-bundle/_expected/umd.js
index 831b45c4bd3..91ca94de7dc 100644
--- a/test/form/samples/self-contained-bundle/_expected/umd.js
+++ b/test/form/samples/self-contained-bundle/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo () {
 		console.log( bar() );
@@ -19,4 +18,4 @@
 	foo();
 	console.log( 3 );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/sequence-expression/_expected/umd.js b/test/form/samples/sequence-expression/_expected/umd.js
index 4a1ef40d623..059d87f43de 100644
--- a/test/form/samples/sequence-expression/_expected/umd.js
+++ b/test/form/samples/sequence-expression/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
     typeof define === 'function' && define.amd ? define(factory) :
-    (factory());
-}(this, (function () { 'use strict';
+    factory();
+}(function () { 'use strict';
 
     function foo$1 () {
         console.log( 'foo' );
@@ -28,4 +27,4 @@
     module$1.bar = function () { console.log( 'bar' );};
     var h = (0, module$1.bar)();
 
-})));
+}));
diff --git a/test/form/samples/shorthand-properties/_expected/umd.js b/test/form/samples/shorthand-properties/_expected/umd.js
index 9d64f6ad8c9..3f506888d89 100644
--- a/test/form/samples/shorthand-properties/_expected/umd.js
+++ b/test/form/samples/shorthand-properties/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function x () {
 		return 'foo';
@@ -26,4 +25,4 @@
 	assert.equal( bar.x(), 'bar' );
 	assert.equal( baz.x(), 'baz' );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-b/_expected/iife.js b/test/form/samples/side-effect-b/_expected/iife.js
index ae23229177f..69d1387d37e 100644
--- a/test/form/samples/side-effect-b/_expected/iife.js
+++ b/test/form/samples/side-effect-b/_expected/iife.js
@@ -5,4 +5,4 @@ var myBundle = (function () {
 
 	return main;
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/side-effect-b/_expected/umd.js b/test/form/samples/side-effect-b/_expected/umd.js
index 2194031a608..5d988c0df7c 100644
--- a/test/form/samples/side-effect-b/_expected/umd.js
+++ b/test/form/samples/side-effect-b/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-c/_expected/iife.js b/test/form/samples/side-effect-c/_expected/iife.js
index ae23229177f..69d1387d37e 100644
--- a/test/form/samples/side-effect-c/_expected/iife.js
+++ b/test/form/samples/side-effect-c/_expected/iife.js
@@ -5,4 +5,4 @@ var myBundle = (function () {
 
 	return main;
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/side-effect-c/_expected/umd.js b/test/form/samples/side-effect-c/_expected/umd.js
index 2194031a608..5d988c0df7c 100644
--- a/test/form/samples/side-effect-c/_expected/umd.js
+++ b/test/form/samples/side-effect-c/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-d/_expected/umd.js b/test/form/samples/side-effect-d/_expected/umd.js
index 2194031a608..5d988c0df7c 100644
--- a/test/form/samples/side-effect-d/_expected/umd.js
+++ b/test/form/samples/side-effect-d/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-e/_expected/umd.js b/test/form/samples/side-effect-e/_expected/umd.js
index 4a3316f0a6b..552ddc2ba07 100644
--- a/test/form/samples/side-effect-e/_expected/umd.js
+++ b/test/form/samples/side-effect-e/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	function foo () {
 		var Object = {
@@ -21,4 +21,4 @@
 
 	return main;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-es5-classes/_expected/umd.js b/test/form/samples/side-effect-es5-classes/_expected/umd.js
index af1549a6dba..a45ab599a29 100644
--- a/test/form/samples/side-effect-es5-classes/_expected/umd.js
+++ b/test/form/samples/side-effect-es5-classes/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function Bar ( x ) {
 		console.log( 'side effect' );
@@ -34,4 +33,4 @@
 
 	console.log( 'after' );
 
-})));
+}));
diff --git a/test/form/samples/side-effect-f/_expected/umd.js b/test/form/samples/side-effect-f/_expected/umd.js
index 2194031a608..5d988c0df7c 100644
--- a/test/form/samples/side-effect-f/_expected/umd.js
+++ b/test/form/samples/side-effect-f/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-g/_expected/umd.js b/test/form/samples/side-effect-g/_expected/umd.js
index 2194031a608..5d988c0df7c 100644
--- a/test/form/samples/side-effect-g/_expected/umd.js
+++ b/test/form/samples/side-effect-g/_expected/umd.js
@@ -1,11 +1,11 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var main = 42;
 
 	return main;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-h/_expected/umd.js b/test/form/samples/side-effect-h/_expected/umd.js
index 8fabe32659b..4e1ccef34af 100644
--- a/test/form/samples/side-effect-h/_expected/umd.js
+++ b/test/form/samples/side-effect-h/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	function foo ( ok ) {
 		if ( !ok ) {
@@ -16,4 +16,4 @@
 
 	return main;
 
-})));
+}));
diff --git a/test/form/samples/side-effect-i/_expected/umd.js b/test/form/samples/side-effect-i/_expected/umd.js
index 87d4d59dd29..1c56ff1d95a 100644
--- a/test/form/samples/side-effect-i/_expected/umd.js
+++ b/test/form/samples/side-effect-i/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	if ( !ok ) {
 		throw new Error( 'this will be included' );
@@ -12,4 +12,4 @@
 
 	return main;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-j/_expected/iife.js b/test/form/samples/side-effect-j/_expected/iife.js
index 6b851090b80..7f340737096 100644
--- a/test/form/samples/side-effect-j/_expected/iife.js
+++ b/test/form/samples/side-effect-j/_expected/iife.js
@@ -9,4 +9,4 @@ var myBundle = (function () {
 
 	return x;
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/side-effect-j/_expected/umd.js b/test/form/samples/side-effect-j/_expected/umd.js
index 1d7d72737c8..580d41c9d38 100644
--- a/test/form/samples/side-effect-j/_expected/umd.js
+++ b/test/form/samples/side-effect-j/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	var augment;
 	augment = x => x.augmented = true;
@@ -12,4 +12,4 @@
 
 	return x;
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-k/_expected/umd.js b/test/form/samples/side-effect-k/_expected/umd.js
index 302275aaa68..14d66c1b014 100644
--- a/test/form/samples/side-effect-k/_expected/umd.js
+++ b/test/form/samples/side-effect-k/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
 	typeof define === 'function' && define.amd ? define(factory) :
-	(global.myBundle = factory());
-}(this, (function () { 'use strict';
+	global.myBundle = factory();
+}(typeof self !== 'undefined' ? self : this, function () { 'use strict';
 
 	function augment ( x ) {
 		var prop, source;
@@ -29,4 +29,4 @@
 
 	return x;
 
-})));
+}));
diff --git a/test/form/samples/side-effect-l/_expected/umd.js b/test/form/samples/side-effect-l/_expected/umd.js
index d561e69c33b..a12a1990f01 100644
--- a/test/form/samples/side-effect-l/_expected/umd.js
+++ b/test/form/samples/side-effect-l/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-m/_expected/umd.js b/test/form/samples/side-effect-m/_expected/umd.js
index 38f9417a3ab..bdeb018d665 100644
--- a/test/form/samples/side-effect-m/_expected/umd.js
+++ b/test/form/samples/side-effect-m/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function odd ( n ) {
 		return n !== 0 && even( n - 1 );
@@ -22,4 +21,4 @@
 
 	console.log( counter );
 
-})));
+}));
diff --git a/test/form/samples/side-effect-n/_expected/iife.js b/test/form/samples/side-effect-n/_expected/iife.js
index 23d5f3782a2..6358928bd7f 100644
--- a/test/form/samples/side-effect-n/_expected/iife.js
+++ b/test/form/samples/side-effect-n/_expected/iife.js
@@ -11,4 +11,4 @@
 
 	( Math.random() < 0.5 ? foo : bar )();
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/side-effect-n/_expected/umd.js b/test/form/samples/side-effect-n/_expected/umd.js
index f83037e56cd..78f1facda20 100644
--- a/test/form/samples/side-effect-n/_expected/umd.js
+++ b/test/form/samples/side-effect-n/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo () {
 		console.log( 'foo' );
@@ -14,4 +13,4 @@
 
 	( Math.random() < 0.5 ? foo : bar )();
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-o/_expected/iife.js b/test/form/samples/side-effect-o/_expected/iife.js
index d3b3b186d8e..0dad11b4d92 100644
--- a/test/form/samples/side-effect-o/_expected/iife.js
+++ b/test/form/samples/side-effect-o/_expected/iife.js
@@ -15,4 +15,4 @@
 
 	fn()();
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/side-effect-o/_expected/umd.js b/test/form/samples/side-effect-o/_expected/umd.js
index 38b9a1d9cbd..ad2c65f6cb4 100644
--- a/test/form/samples/side-effect-o/_expected/umd.js
+++ b/test/form/samples/side-effect-o/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function fn () {
 		return Math.random() < 0.5 ? foo : bar;
@@ -18,4 +17,4 @@
 
 	fn()();
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-p/_expected/umd.js b/test/form/samples/side-effect-p/_expected/umd.js
index 2746cc75dc8..59dcaeb2c08 100644
--- a/test/form/samples/side-effect-p/_expected/umd.js
+++ b/test/form/samples/side-effect-p/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const hs = document.documentElement.style;
 
@@ -10,4 +9,4 @@
 		hs.color = "#222";
 	}
 
-})));
+}));
diff --git a/test/form/samples/side-effect-q/_expected/iife.js b/test/form/samples/side-effect-q/_expected/iife.js
index f3d1016ed3e..43ef5426880 100644
--- a/test/form/samples/side-effect-q/_expected/iife.js
+++ b/test/form/samples/side-effect-q/_expected/iife.js
@@ -3,4 +3,4 @@
 
 
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/side-effect-q/_expected/umd.js b/test/form/samples/side-effect-q/_expected/umd.js
index d561e69c33b..a12a1990f01 100644
--- a/test/form/samples/side-effect-q/_expected/umd.js
+++ b/test/form/samples/side-effect-q/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effect-r/_expected/umd.js b/test/form/samples/side-effect-r/_expected/umd.js
index 07ce27e42f1..a12a1990f01 100644
--- a/test/form/samples/side-effect-r/_expected/umd.js
+++ b/test/form/samples/side-effect-r/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 
 
-})));
+}));
diff --git a/test/form/samples/side-effect-s/_expected/umd.js b/test/form/samples/side-effect-s/_expected/umd.js
index 07ce27e42f1..a12a1990f01 100644
--- a/test/form/samples/side-effect-s/_expected/umd.js
+++ b/test/form/samples/side-effect-s/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 
 
-})));
+}));
diff --git a/test/form/samples/side-effect-t/_expected/umd.js b/test/form/samples/side-effect-t/_expected/umd.js
index e55832a55b5..b0eb576e116 100644
--- a/test/form/samples/side-effect-t/_expected/umd.js
+++ b/test/form/samples/side-effect-t/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo () {
 		throw new Error( 'throw side effect' );
@@ -10,4 +9,4 @@
 
 	foo();
 
-})));
+}));
diff --git a/test/form/samples/side-effect-with-plusplus-expression/_expected/umd.js b/test/form/samples/side-effect-with-plusplus-expression/_expected/umd.js
index 07ce27e42f1..a12a1990f01 100644
--- a/test/form/samples/side-effect-with-plusplus-expression/_expected/umd.js
+++ b/test/form/samples/side-effect-with-plusplus-expression/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 
 
-})));
+}));
diff --git a/test/form/samples/side-effect/_expected/umd.js b/test/form/samples/side-effect/_expected/umd.js
index e0961e0680f..28e8f5b074e 100644
--- a/test/form/samples/side-effect/_expected/umd.js
+++ b/test/form/samples/side-effect/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var foo = 42;
 
 	assert.equal( foo, 42 );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/side-effects-await/_expected/umd.js b/test/form/samples/side-effects-await/_expected/umd.js
index afe283fbb51..0363b0cd7d8 100644
--- a/test/form/samples/side-effects-await/_expected/umd.js
+++ b/test/form/samples/side-effects-await/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	async function hasEffects1 () {
 		await globalPromise;
@@ -17,4 +16,4 @@
 
 	hasEffects2();
 
-})));
+}));
diff --git a/test/form/samples/side-effects-break-statements/_expected/umd.js b/test/form/samples/side-effects-break-statements/_expected/umd.js
index 264836353f7..047cf3d0152 100644
--- a/test/form/samples/side-effects-break-statements/_expected/umd.js
+++ b/test/form/samples/side-effects-break-statements/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	for ( let i = 0; i < 2; i++ ) {
 		console.log( 'effect' );
@@ -29,4 +28,4 @@
 		break;
 	} while ( true );
 
-})));
+}));
diff --git a/test/form/samples/side-effects-call-arguments/_expected/umd.js b/test/form/samples/side-effects-call-arguments/_expected/umd.js
index f8b04986596..638a58b2f11 100644
--- a/test/form/samples/side-effects-call-arguments/_expected/umd.js
+++ b/test/form/samples/side-effects-call-arguments/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo () {}
 	foo( globalFunction() );
@@ -12,4 +11,4 @@
 
 	assert.equal(baz, 3);
 
-})));
+}));
diff --git a/test/form/samples/side-effects-computed-pattern-keys/_expected/umd.js b/test/form/samples/side-effects-computed-pattern-keys/_expected/umd.js
index ebf77fc440c..8ce7c7f77de 100644
--- a/test/form/samples/side-effects-computed-pattern-keys/_expected/umd.js
+++ b/test/form/samples/side-effects-computed-pattern-keys/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const { [globalValue()]: isKept } = {};
 
-})));
+}));
diff --git a/test/form/samples/side-effects-delete/_expected/umd.js b/test/form/samples/side-effects-delete/_expected/umd.js
index 887655fe965..0a22049cbff 100644
--- a/test/form/samples/side-effects-delete/_expected/umd.js
+++ b/test/form/samples/side-effects-delete/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.myBundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.myBundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	var x = {foo: 'bar'};
 	delete x.foo;
@@ -13,4 +13,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/side-effects-es6-class-declarations/_expected/umd.js b/test/form/samples/side-effects-es6-class-declarations/_expected/umd.js
index b9b21754550..9f3552c722d 100644
--- a/test/form/samples/side-effects-es6-class-declarations/_expected/umd.js
+++ b/test/form/samples/side-effects-es6-class-declarations/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	class KeySideEffect {
 		[console.log( 'effect' )] () {}
@@ -38,4 +37,4 @@
 	}
 	const methodCallSideEffect = new MethodCallSideEffect();
 
-})));
+}));
diff --git a/test/form/samples/side-effects-es6-class-expressions/_expected/umd.js b/test/form/samples/side-effects-es6-class-expressions/_expected/umd.js
index aef31d7af70..e98968c3d8f 100644
--- a/test/form/samples/side-effects-es6-class-expressions/_expected/umd.js
+++ b/test/form/samples/side-effects-es6-class-expressions/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	class KeySideEffect {
 		[console.log( 'effect' )] () {}
@@ -38,4 +37,4 @@
 	};
 	const methodCallSideEffect = new MethodCallSideEffect();
 
-})));
+}));
diff --git a/test/form/samples/side-effects-es6-super-classes/_expected/umd.js b/test/form/samples/side-effects-es6-super-classes/_expected/umd.js
index eb91b0124ab..cba2378599e 100644
--- a/test/form/samples/side-effects-es6-super-classes/_expected/umd.js
+++ b/test/form/samples/side-effects-es6-super-classes/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	class GlobalSuper extends GlobalClass {}
 	const globalSuper = new GlobalSuper();
@@ -41,4 +40,4 @@
 	}
 	const sideEffectsSuperMethod = new SideEffectsSuperMethod();
 
-})));
+}));
diff --git a/test/form/samples/side-effects-expressions-as-statements/_expected/umd.js b/test/form/samples/side-effects-expressions-as-statements/_expected/umd.js
index 0b1472f25ef..2d87b957317 100644
--- a/test/form/samples/side-effects-expressions-as-statements/_expected/umd.js
+++ b/test/form/samples/side-effects-expressions-as-statements/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	// Access getters with side-effects to e.g. force DOM repaints
 	globalVar.getter;
@@ -11,4 +10,4 @@
 	// Call pure constructors for side-effects for e.g. feature detection
 	new Function('');
 
-})));
+}));
diff --git a/test/form/samples/side-effects-generators/_expected/umd.js b/test/form/samples/side-effects-generators/_expected/umd.js
index 588f174ecc3..44149f8c116 100644
--- a/test/form/samples/side-effects-generators/_expected/umd.js
+++ b/test/form/samples/side-effects-generators/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function* sideEffectYield() {
 		yield globalFunction();
@@ -29,4 +28,4 @@
 
 	const iterator4 = sideEffectNestedYield();
 
-})));
+}));
diff --git a/test/form/samples/side-effects-getters-and-setters/_expected/umd.js b/test/form/samples/side-effects-getters-and-setters/_expected/umd.js
index 9320e1876d8..f71f023b312 100644
--- a/test/form/samples/side-effects-getters-and-setters/_expected/umd.js
+++ b/test/form/samples/side-effects-getters-and-setters/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const retained1a = {
 		get effect () {
@@ -41,4 +40,4 @@
 
 	retained7.foo();
 
-})));
+}));
diff --git a/test/form/samples/side-effects-in-template-literals/_expected/umd.js b/test/form/samples/side-effects-in-template-literals/_expected/umd.js
index 7a13c4dc492..8cee35d06f4 100644
--- a/test/form/samples/side-effects-in-template-literals/_expected/umd.js
+++ b/test/form/samples/side-effects-in-template-literals/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.myBundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.myBundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	exports.x = 0;
 
@@ -31,4 +31,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/side-effects-logical-expressions/_expected/umd.js b/test/form/samples/side-effects-logical-expressions/_expected/umd.js
index 36b38e7839b..7ec6bfaf34c 100644
--- a/test/form/samples/side-effects-logical-expressions/_expected/umd.js
+++ b/test/form/samples/side-effects-logical-expressions/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	// effect
 	console.log( 'effect' );
@@ -37,4 +36,4 @@
 	(() => () => console.log( 'effect' ))()();
 	(() => () => console.log( 'effect' ))()();
 
-})));
+}));
diff --git a/test/form/samples/side-effects-object-literal-calls/_expected/umd.js b/test/form/samples/side-effects-object-literal-calls/_expected/umd.js
index 764e3fc71cf..7e1eae8f8eb 100644
--- a/test/form/samples/side-effects-object-literal-calls/_expected/umd.js
+++ b/test/form/samples/side-effects-object-literal-calls/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const retained1 = { x: () => {} };
 	retained1.y();
@@ -26,4 +25,4 @@
 	retained8.x.y = () => console.log( 'effect' );
 	retained7.x.y();
 
-})));
+}));
diff --git a/test/form/samples/side-effects-object-literal-mutation/_expected/umd.js b/test/form/samples/side-effects-object-literal-mutation/_expected/umd.js
index 1ed1a9cb205..94e977da6a6 100644
--- a/test/form/samples/side-effects-object-literal-mutation/_expected/umd.js
+++ b/test/form/samples/side-effects-object-literal-mutation/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.bundle = {})));
-}(this, (function (exports) { 'use strict';
+	factory(global.bundle = {});
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	const retained1 = { x: {} };
 	retained1.y = 1;
@@ -33,4 +33,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/side-effects-parameter-defaults/_expected/umd.js b/test/form/samples/side-effects-parameter-defaults/_expected/umd.js
index 2793a365836..67a06352401 100644
--- a/test/form/samples/side-effects-parameter-defaults/_expected/umd.js
+++ b/test/form/samples/side-effects-parameter-defaults/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const effect = () => console.log( 'effect' );
 
@@ -30,4 +29,4 @@
 	};
 	bArr();
 
-})));
+}));
diff --git a/test/form/samples/side-effects-pattern-assignment/_expected/umd.js b/test/form/samples/side-effects-pattern-assignment/_expected/umd.js
index 603670a84ca..1a084c714d2 100644
--- a/test/form/samples/side-effects-pattern-assignment/_expected/umd.js
+++ b/test/form/samples/side-effects-pattern-assignment/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var e = {};
 	({x: e} = globalVar);
@@ -32,4 +31,4 @@
 	var [...p] = globalVar;
 	p.foo = 1;
 
-})));
+}));
diff --git a/test/form/samples/side-effects-pattern-defaults/_expected/umd.js b/test/form/samples/side-effects-pattern-defaults/_expected/umd.js
index 3172bc150ba..b20b77fef98 100644
--- a/test/form/samples/side-effects-pattern-defaults/_expected/umd.js
+++ b/test/form/samples/side-effects-pattern-defaults/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const effect = () => console.log( 'effect' );
 	var { x: a2 = effect() } = {};
@@ -32,4 +31,4 @@
 	[ d4 = effect ] = [];
 	d4();
 
-})));
+}));
diff --git a/test/form/samples/side-effects-prototype-assignments/_expected/umd.js b/test/form/samples/side-effects-prototype-assignments/_expected/umd.js
index 9511791bee2..ae1f6a4870e 100644
--- a/test/form/samples/side-effects-prototype-assignments/_expected/umd.js
+++ b/test/form/samples/side-effects-prototype-assignments/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function V8Engine () {}
 
@@ -15,4 +14,4 @@
 
 	console.log( new V8Engine().toString() );
 
-})));
+}));
diff --git a/test/form/samples/side-effects-reassignment/_expected/umd.js b/test/form/samples/side-effects-reassignment/_expected/umd.js
index da0c3fe9ef8..d8faefe4a45 100644
--- a/test/form/samples/side-effects-reassignment/_expected/umd.js
+++ b/test/form/samples/side-effects-reassignment/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var effect = function() {
 		console.log('effect');
@@ -11,4 +10,4 @@
 	var alsoEffect = effect;
 	alsoEffect();
 
-})));
+}));
diff --git a/test/form/samples/side-effects-return-statements/_expected/umd.js b/test/form/samples/side-effects-return-statements/_expected/umd.js
index 4ce3b39e737..c3e485bc2f3 100644
--- a/test/form/samples/side-effects-return-statements/_expected/umd.js
+++ b/test/form/samples/side-effects-return-statements/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function isUsed ( x ) {
 		if ( x ) {
@@ -13,4 +12,4 @@
 
 	assert.equal( isUsed( true ), 2 );
 
-})));
+}));
diff --git a/test/form/samples/side-effects-switch-statements/_expected/umd.js b/test/form/samples/side-effects-switch-statements/_expected/umd.js
index 7965d940ebf..1425498a1dd 100644
--- a/test/form/samples/side-effects-switch-statements/_expected/umd.js
+++ b/test/form/samples/side-effects-switch-statements/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function effect () {
 		console.log( 'effect' );
@@ -37,4 +36,4 @@
 		}
 	}());
 
-})));
+}));
diff --git a/test/form/samples/skips-dead-branches-b/_expected/umd.js b/test/form/samples/skips-dead-branches-b/_expected/umd.js
index b3926b0f8b0..e7c3a2f6229 100644
--- a/test/form/samples/skips-dead-branches-b/_expected/umd.js
+++ b/test/form/samples/skips-dead-branches-b/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function bar () {
 		console.log( 'this should be included' );
@@ -10,4 +9,4 @@
 
 	bar();
 
-})));
+}));
diff --git a/test/form/samples/skips-dead-branches-c/_expected/umd.js b/test/form/samples/skips-dead-branches-c/_expected/umd.js
index 3a8711191a7..b3024a79cf4 100644
--- a/test/form/samples/skips-dead-branches-c/_expected/umd.js
+++ b/test/form/samples/skips-dead-branches-c/_expected/umd.js
@@ -1,12 +1,11 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function bar () {
 		console.log( 'this should be included' );
 	}
 	bar();
 
-})));
+}));
diff --git a/test/form/samples/skips-dead-branches-d/_expected/umd.js b/test/form/samples/skips-dead-branches-d/_expected/umd.js
index 3a8711191a7..b3024a79cf4 100644
--- a/test/form/samples/skips-dead-branches-d/_expected/umd.js
+++ b/test/form/samples/skips-dead-branches-d/_expected/umd.js
@@ -1,12 +1,11 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function bar () {
 		console.log( 'this should be included' );
 	}
 	bar();
 
-})));
+}));
diff --git a/test/form/samples/skips-dead-branches-e/_expected/umd.js b/test/form/samples/skips-dead-branches-e/_expected/umd.js
index 3a8711191a7..b3024a79cf4 100644
--- a/test/form/samples/skips-dead-branches-e/_expected/umd.js
+++ b/test/form/samples/skips-dead-branches-e/_expected/umd.js
@@ -1,12 +1,11 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function bar () {
 		console.log( 'this should be included' );
 	}
 	bar();
 
-})));
+}));
diff --git a/test/form/samples/skips-dead-branches-f/_expected/umd.js b/test/form/samples/skips-dead-branches-f/_expected/umd.js
index 3a8711191a7..b3024a79cf4 100644
--- a/test/form/samples/skips-dead-branches-f/_expected/umd.js
+++ b/test/form/samples/skips-dead-branches-f/_expected/umd.js
@@ -1,12 +1,11 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function bar () {
 		console.log( 'this should be included' );
 	}
 	bar();
 
-})));
+}));
diff --git a/test/form/samples/skips-dead-branches-g/_expected/umd.js b/test/form/samples/skips-dead-branches-g/_expected/umd.js
index 168aa8eff1d..5e09cad5bad 100644
--- a/test/form/samples/skips-dead-branches-g/_expected/umd.js
+++ b/test/form/samples/skips-dead-branches-g/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var a = 0;
 	var b = 1;
@@ -12,4 +11,4 @@
 
 	console.log( x + y );
 
-})));
+}));
diff --git a/test/form/samples/skips-dead-branches-h/_expected/umd.js b/test/form/samples/skips-dead-branches-h/_expected/umd.js
index 6286b12c6e0..c5797665794 100644
--- a/test/form/samples/skips-dead-branches-h/_expected/umd.js
+++ b/test/form/samples/skips-dead-branches-h/_expected/umd.js
@@ -1,12 +1,11 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function baz() {
 		console.log("baz");
 	}
 	baz();
 
-})));
+}));
diff --git a/test/form/samples/skips-dead-branches-i/_expected/umd.js b/test/form/samples/skips-dead-branches-i/_expected/umd.js
index 6286b12c6e0..c5797665794 100644
--- a/test/form/samples/skips-dead-branches-i/_expected/umd.js
+++ b/test/form/samples/skips-dead-branches-i/_expected/umd.js
@@ -1,12 +1,11 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function baz() {
 		console.log("baz");
 	}
 	baz();
 
-})));
+}));
diff --git a/test/form/samples/skips-dead-branches-j/_expected/umd.js b/test/form/samples/skips-dead-branches-j/_expected/umd.js
index 2f6e70a629f..3d48fee6d70 100644
--- a/test/form/samples/skips-dead-branches-j/_expected/umd.js
+++ b/test/form/samples/skips-dead-branches-j/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	{
 		console.log( 'true' );
 	}
 
-})));
+}));
diff --git a/test/form/samples/skips-dead-branches/_expected/iife.js b/test/form/samples/skips-dead-branches/_expected/iife.js
index 8d6dcb52c0c..3b894d92a46 100644
--- a/test/form/samples/skips-dead-branches/_expected/iife.js
+++ b/test/form/samples/skips-dead-branches/_expected/iife.js
@@ -7,4 +7,4 @@
 
 	bar();
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/skips-dead-branches/_expected/umd.js b/test/form/samples/skips-dead-branches/_expected/umd.js
index 67588d41402..e7c3a2f6229 100644
--- a/test/form/samples/skips-dead-branches/_expected/umd.js
+++ b/test/form/samples/skips-dead-branches/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function bar () {
 		console.log( 'this should be included' );
@@ -10,4 +9,4 @@
 
 	bar();
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/sourcemaps-excludesources/_expected/umd.js b/test/form/samples/sourcemaps-excludesources/_expected/umd.js
index 66c188170a8..deab6234b48 100644
--- a/test/form/samples/sourcemaps-excludesources/_expected/umd.js
+++ b/test/form/samples/sourcemaps-excludesources/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo () {
 		console.log( 'hello from foo.js' );
@@ -17,5 +16,5 @@
 	foo();
 	bar();
 
-})));
+}));
 //# sourceMappingURL=umd.js.map
diff --git a/test/form/samples/sourcemaps-excludesources/_expected/umd.js.map b/test/form/samples/sourcemaps-excludesources/_expected/umd.js.map
index 14076ea6ad2..5add4081f0d 100644
--- a/test/form/samples/sourcemaps-excludesources/_expected/umd.js.map
+++ b/test/form/samples/sourcemaps-excludesources/_expected/umd.js.map
@@ -1 +1 @@
-{"version":3,"file":"umd.js","sources":["../foo.js","../bar.js","../main.js"],"sourcesContent":null,"names":[],"mappings":";;;;;;CAAe,SAAS,GAAG,IAAI;CAC/B,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;CACpC,CAAC;;CCFc,SAAS,GAAG,IAAI;CAC/B,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;CACpC,CAAC;;CCCD,OAAO,CAAC,GAAG,EAAE,oBAAoB,EAAE,CAAC;;CAEpC,GAAG,EAAE,CAAC;CACN,GAAG,EAAE,CAAC;;;;"}
\ No newline at end of file
+{"version":3,"file":"umd.js","sources":["../foo.js","../bar.js","../main.js"],"sourcesContent":null,"names":[],"mappings":";;;;;CAAe,SAAS,GAAG,IAAI;CAC/B,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;CACpC,CAAC;;CCFc,SAAS,GAAG,IAAI;CAC/B,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;CACpC,CAAC;;CCCD,OAAO,CAAC,GAAG,EAAE,oBAAoB,EAAE,CAAC;;CAEpC,GAAG,EAAE,CAAC;CACN,GAAG,EAAE,CAAC;;;;"}
diff --git a/test/form/samples/sourcemaps-external/_expected/umd.js b/test/form/samples/sourcemaps-external/_expected/umd.js
index 66c188170a8..deab6234b48 100644
--- a/test/form/samples/sourcemaps-external/_expected/umd.js
+++ b/test/form/samples/sourcemaps-external/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo () {
 		console.log( 'hello from foo.js' );
@@ -17,5 +16,5 @@
 	foo();
 	bar();
 
-})));
+}));
 //# sourceMappingURL=umd.js.map
diff --git a/test/form/samples/sourcemaps-external/_expected/umd.js.map b/test/form/samples/sourcemaps-external/_expected/umd.js.map
index 5b1f9d082c7..a9238714988 100644
--- a/test/form/samples/sourcemaps-external/_expected/umd.js.map
+++ b/test/form/samples/sourcemaps-external/_expected/umd.js.map
@@ -1 +1 @@
-{"version":3,"file":"umd.js","sources":["../foo.js","../bar.js","../main.js"],"sourcesContent":["export default function foo () {\n\tconsole.log( 'hello from foo.js' );\n}\n","export default function bar () {\n\tconsole.log( 'hello from bar.js' );\n}\n","import foo from './foo';\nimport bar from './bar';\n\nconsole.log( 'hello from main.js' );\n\nfoo();\nbar();\n"],"names":[],"mappings":";;;;;;CAAe,SAAS,GAAG,IAAI;CAC/B,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;CACpC,CAAC;;CCFc,SAAS,GAAG,IAAI;CAC/B,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;CACpC,CAAC;;CCCD,OAAO,CAAC,GAAG,EAAE,oBAAoB,EAAE,CAAC;;CAEpC,GAAG,EAAE,CAAC;CACN,GAAG,EAAE,CAAC;;;;"}
\ No newline at end of file
+{"version":3,"file":"umd.js","sources":["../foo.js","../bar.js","../main.js"],"sourcesContent":["export default function foo () {\n\tconsole.log( 'hello from foo.js' );\n}\n","export default function bar () {\n\tconsole.log( 'hello from bar.js' );\n}\n","import foo from './foo';\nimport bar from './bar';\n\nconsole.log( 'hello from main.js' );\n\nfoo();\nbar();\n"],"names":[],"mappings":";;;;;CAAe,SAAS,GAAG,IAAI;CAC/B,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;CACpC,CAAC;;CCFc,SAAS,GAAG,IAAI;CAC/B,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;CACpC,CAAC;;CCCD,OAAO,CAAC,GAAG,EAAE,oBAAoB,EAAE,CAAC;;CAEpC,GAAG,EAAE,CAAC;CACN,GAAG,EAAE,CAAC;;;;"}
\ No newline at end of file
diff --git a/test/form/samples/sourcemaps-inline/_expected/umd.js b/test/form/samples/sourcemaps-inline/_expected/umd.js
index e7ea96ac86b..e3b2ebb6969 100644
--- a/test/form/samples/sourcemaps-inline/_expected/umd.js
+++ b/test/form/samples/sourcemaps-inline/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo () {
 		console.log( 'hello from foo.js' );
@@ -17,5 +16,5 @@
 	foo();
 	bar();
 
-})));
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW1kLmpzIiwic291cmNlcyI6WyIuLi9mb28uanMiLCIuLi9iYXIuanMiLCIuLi9tYWluLmpzIl0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIGZvbyAoKSB7XG5cdGNvbnNvbGUubG9nKCAnaGVsbG8gZnJvbSBmb28uanMnICk7XG59XG4iLCJleHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBiYXIgKCkge1xuXHRjb25zb2xlLmxvZyggJ2hlbGxvIGZyb20gYmFyLmpzJyApO1xufVxuIiwiaW1wb3J0IGZvbyBmcm9tICcuL2Zvbyc7XG5pbXBvcnQgYmFyIGZyb20gJy4vYmFyJztcblxuY29uc29sZS5sb2coICdoZWxsbyBmcm9tIG1haW4uanMnICk7XG5cbmZvbygpO1xuYmFyKCk7XG4iXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0NBQWUsU0FBUyxHQUFHLElBQUk7Q0FDL0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLG1CQUFtQixFQUFFLENBQUM7Q0FDcEMsQ0FBQzs7Q0NGYyxTQUFTLEdBQUcsSUFBSTtDQUMvQixDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsbUJBQW1CLEVBQUUsQ0FBQztDQUNwQyxDQUFDOztDQ0NELE9BQU8sQ0FBQyxHQUFHLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQzs7Q0FFcEMsR0FBRyxFQUFFLENBQUM7Q0FDTixHQUFHLEVBQUUsQ0FBQzs7OzsifQ==
+}));
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW1kLmpzIiwic291cmNlcyI6WyIuLi9mb28uanMiLCIuLi9iYXIuanMiLCIuLi9tYWluLmpzIl0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIGZvbyAoKSB7XG5cdGNvbnNvbGUubG9nKCAnaGVsbG8gZnJvbSBmb28uanMnICk7XG59XG4iLCJleHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBiYXIgKCkge1xuXHRjb25zb2xlLmxvZyggJ2hlbGxvIGZyb20gYmFyLmpzJyApO1xufVxuIiwiaW1wb3J0IGZvbyBmcm9tICcuL2Zvbyc7XG5pbXBvcnQgYmFyIGZyb20gJy4vYmFyJztcblxuY29uc29sZS5sb2coICdoZWxsbyBmcm9tIG1haW4uanMnICk7XG5cbmZvbygpO1xuYmFyKCk7XG4iXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Q0FBZSxTQUFTLEdBQUcsSUFBSTtDQUMvQixDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsbUJBQW1CLEVBQUUsQ0FBQztDQUNwQyxDQUFDOztDQ0ZjLFNBQVMsR0FBRyxJQUFJO0NBQy9CLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxtQkFBbUIsRUFBRSxDQUFDO0NBQ3BDLENBQUM7O0NDQ0QsT0FBTyxDQUFDLEdBQUcsRUFBRSxvQkFBb0IsRUFBRSxDQUFDOztDQUVwQyxHQUFHLEVBQUUsQ0FBQztDQUNOLEdBQUcsRUFBRSxDQUFDOzs7OyJ9
diff --git a/test/form/samples/spacing-after-function-with-semicolon/_expected/umd.js b/test/form/samples/spacing-after-function-with-semicolon/_expected/umd.js
index 4730500a2f7..ddcb5c5ba1a 100644
--- a/test/form/samples/spacing-after-function-with-semicolon/_expected/umd.js
+++ b/test/form/samples/spacing-after-function-with-semicolon/_expected/umd.js
@@ -1,10 +1,9 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function x () { return 'x' }
 	assert.equal( x(), 'x' );
 
-})));
+}));
diff --git a/test/form/samples/string-indentation-b/_expected/umd.js b/test/form/samples/string-indentation-b/_expected/umd.js
index e86eb38ea14..bff1fc4bb73 100644
--- a/test/form/samples/string-indentation-b/_expected/umd.js
+++ b/test/form/samples/string-indentation-b/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
     typeof define === 'function' && define.amd ? define(factory) :
-    (factory());
-}(this, (function () { 'use strict';
+    factory();
+}(function () { 'use strict';
 
     var a = 'a',
         b = 'b';
@@ -10,4 +9,4 @@
     assert.equal( a, 'a' );
     assert.equal( b, 'b' );
 
-})));
+}));
diff --git a/test/form/samples/string-indentation/_expected/umd.js b/test/form/samples/string-indentation/_expected/umd.js
index ac7131e15cb..5f5e8533a2b 100644
--- a/test/form/samples/string-indentation/_expected/umd.js
+++ b/test/form/samples/string-indentation/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var a = '1\
   2';
@@ -21,4 +20,4 @@
 	assert.equal( c, '1\n  2' );
 	assert.equal( d, '1\n\t2' );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/switch-scopes/_expected/umd.js b/test/form/samples/switch-scopes/_expected/umd.js
index 626ecf4dcb7..9d4e6d912d5 100644
--- a/test/form/samples/switch-scopes/_expected/umd.js
+++ b/test/form/samples/switch-scopes/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const x = globalFunction;
 
@@ -15,4 +14,4 @@
 		case 4:
 	}
 
-})));
+}));
diff --git a/test/form/samples/this-in-imports/_expected/umd.js b/test/form/samples/this-in-imports/_expected/umd.js
index 340ab31185f..da33ac598fa 100644
--- a/test/form/samples/this-in-imports/_expected/umd.js
+++ b/test/form/samples/this-in-imports/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function B () {
 		this.x = 1;
@@ -20,4 +19,4 @@
 	const b2 = B$1();
 	const b3 = B3();
 
-})));
+}));
diff --git a/test/form/samples/this-is-undefined/_expected/umd.js b/test/form/samples/this-is-undefined/_expected/umd.js
index 996e79856f4..7953b987e35 100644
--- a/test/form/samples/this-is-undefined/_expected/umd.js
+++ b/test/form/samples/this-is-undefined/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const fooContext = {};
 
@@ -22,4 +21,4 @@
 	// outside a function, `this` is undefined
 	assert.strictEqual( undefined, undefined );
 
-})));
+}));
diff --git a/test/form/samples/transform-bundle-plugin-options/_expected/iife.js b/test/form/samples/transform-bundle-plugin-options/_expected/iife.js
index 6a203506593..afd51ee73b2 100644
--- a/test/form/samples/transform-bundle-plugin-options/_expected/iife.js
+++ b/test/form/samples/transform-bundle-plugin-options/_expected/iife.js
@@ -1 +1 @@
-iife
\ No newline at end of file
+iife
diff --git a/test/form/samples/transform-bundle-plugin-options/_expected/umd.js b/test/form/samples/transform-bundle-plugin-options/_expected/umd.js
index 03b5cf720f3..3dc8f1c9e17 100644
--- a/test/form/samples/transform-bundle-plugin-options/_expected/umd.js
+++ b/test/form/samples/transform-bundle-plugin-options/_expected/umd.js
@@ -1 +1 @@
-umd
\ No newline at end of file
+umd
diff --git a/test/form/samples/transform-bundle-plugin/_expected/iife.js b/test/form/samples/transform-bundle-plugin/_expected/iife.js
index f783236effa..6dd9ebb24b6 100644
--- a/test/form/samples/transform-bundle-plugin/_expected/iife.js
+++ b/test/form/samples/transform-bundle-plugin/_expected/iife.js
@@ -1,2 +1,2 @@
 /* first plugin */
-/* second plugin */
\ No newline at end of file
+/* second plugin */
diff --git a/test/form/samples/transform-bundle-plugin/_expected/umd.js b/test/form/samples/transform-bundle-plugin/_expected/umd.js
index f783236effa..6dd9ebb24b6 100644
--- a/test/form/samples/transform-bundle-plugin/_expected/umd.js
+++ b/test/form/samples/transform-bundle-plugin/_expected/umd.js
@@ -1,2 +1,2 @@
 /* first plugin */
-/* second plugin */
\ No newline at end of file
+/* second plugin */
diff --git a/test/form/samples/tree-shake-curried-functions/_expected/umd.js b/test/form/samples/tree-shake-curried-functions/_expected/umd.js
index 07ce27e42f1..a12a1990f01 100644
--- a/test/form/samples/tree-shake-curried-functions/_expected/umd.js
+++ b/test/form/samples/tree-shake-curried-functions/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 
 
-})));
+}));
diff --git a/test/form/samples/tree-shake-default-exports/_expected/umd.js b/test/form/samples/tree-shake-default-exports/_expected/umd.js
index 9d40b72e887..6a85fe815cb 100644
--- a/test/form/samples/tree-shake-default-exports/_expected/umd.js
+++ b/test/form/samples/tree-shake-default-exports/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	/* header 1 */
 
@@ -66,4 +65,4 @@
 	importedUsedFunction();
 	usedNamedFunction();
 
-})));
+}));
diff --git a/test/form/samples/tree-shake-if-statements/_expected/umd.js b/test/form/samples/tree-shake-if-statements/_expected/umd.js
index 4af018356cb..c9d8e7c3bcd 100644
--- a/test/form/samples/tree-shake-if-statements/_expected/umd.js
+++ b/test/form/samples/tree-shake-if-statements/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	if (console.log(1) || unknown) ;
 
@@ -62,4 +61,4 @@
 		console.log('kept');
 	}
 
-})));
+}));
diff --git a/test/form/samples/tree-shake-logical-expressions/_expected/umd.js b/test/form/samples/tree-shake-logical-expressions/_expected/umd.js
index 6e4e617587d..42b9b87b7da 100644
--- a/test/form/samples/tree-shake-logical-expressions/_expected/umd.js
+++ b/test/form/samples/tree-shake-logical-expressions/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function getStringA() {
 		return 'A';
@@ -20,4 +19,4 @@
 
 	console.log(getStringD());
 
-})));
+}));
diff --git a/test/form/samples/umd-noconflict-extend/_expected/iife.js b/test/form/samples/umd-noconflict-extend/_expected/iife.js
index 9690df9a1b3..119a7248a7e 100644
--- a/test/form/samples/umd-noconflict-extend/_expected/iife.js
+++ b/test/form/samples/umd-noconflict-extend/_expected/iife.js
@@ -13,4 +13,4 @@
 	exports.number = number;
 	exports.setting = setting;
 
-}((this.FooBar = this.FooBar || {})));
+}(this.FooBar = this.FooBar || {}));
diff --git a/test/form/samples/umd-noconflict-extend/_expected/umd.js b/test/form/samples/umd-noconflict-extend/_expected/umd.js
index 1ae7cf82baa..f27878ac8c6 100644
--- a/test/form/samples/umd-noconflict-extend/_expected/umd.js
+++ b/test/form/samples/umd-noconflict-extend/_expected/umd.js
@@ -3,12 +3,12 @@
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
 	(function() {
 		var current = global.FooBar;
-		var exports = (global.FooBar = global.FooBar || {});
+		var exports = global.FooBar = global.FooBar || {};
 		factory(exports);
 		global.FooBar = exports;
 		exports.noConflict = function() { global.FooBar = current; return exports; };
 	})();
-}(this, (function (exports) { 'use strict';
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	function doThings() {
 		console.log( 'doing things...' );
@@ -24,4 +24,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/umd-noconflict-namespaced/_expected/umd.js b/test/form/samples/umd-noconflict-namespaced/_expected/umd.js
index 770e508f902..8881e96de77 100644
--- a/test/form/samples/umd-noconflict-namespaced/_expected/umd.js
+++ b/test/form/samples/umd-noconflict-namespaced/_expected/umd.js
@@ -3,12 +3,12 @@
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
 	(function() {
 		var current = global.my && global.my.name && global.my.name.spaced && global.my.name.spaced.module;
-		var exports = (global.my = global.my || {}, global.my.name = global.my.name || {}, global.my.name.spaced = global.my.name.spaced || {}, global.my.name.spaced.module = {});
+		var exports = global.my = global.my || {}, global.my.name = global.my.name || {}, global.my.name.spaced = global.my.name.spaced || {}, global.my.name.spaced.module = {};
 		factory(exports);
 		global.my.name.spaced.module = exports;
 		exports.noConflict = function() { global.my.name.spaced.module = current; return exports; };
 	})();
-}(this, (function (exports) { 'use strict';
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	function doThings() {
 		console.log( 'doing things...' );
@@ -24,4 +24,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/umd-noconflict-no-exports/_config.js b/test/form/samples/umd-noconflict-no-exports/_config.js
new file mode 100644
index 00000000000..93a353386b0
--- /dev/null
+++ b/test/form/samples/umd-noconflict-no-exports/_config.js
@@ -0,0 +1,9 @@
+module.exports = {
+	description: 'exports noConflict even when there are no exports',
+	options: {
+		output: {
+			noConflict: true,
+			name: 'FooBar'
+		}
+	}
+};
diff --git a/test/form/samples/umd-noconflict-no-exports/_expected/amd.js b/test/form/samples/umd-noconflict-no-exports/_expected/amd.js
new file mode 100644
index 00000000000..861a053bf95
--- /dev/null
+++ b/test/form/samples/umd-noconflict-no-exports/_expected/amd.js
@@ -0,0 +1,5 @@
+define(function () { 'use strict';
+
+	console.log('no exports');
+
+});
diff --git a/test/form/samples/umd-noconflict-no-exports/_expected/cjs.js b/test/form/samples/umd-noconflict-no-exports/_expected/cjs.js
new file mode 100644
index 00000000000..be430b05115
--- /dev/null
+++ b/test/form/samples/umd-noconflict-no-exports/_expected/cjs.js
@@ -0,0 +1,3 @@
+'use strict';
+
+console.log('no exports');
diff --git a/test/form/samples/umd-noconflict-no-exports/_expected/es.js b/test/form/samples/umd-noconflict-no-exports/_expected/es.js
new file mode 100644
index 00000000000..449280bb09a
--- /dev/null
+++ b/test/form/samples/umd-noconflict-no-exports/_expected/es.js
@@ -0,0 +1 @@
+console.log('no exports');
diff --git a/test/form/samples/umd-noconflict-no-exports/_expected/iife.js b/test/form/samples/umd-noconflict-no-exports/_expected/iife.js
new file mode 100644
index 00000000000..13ad15c8736
--- /dev/null
+++ b/test/form/samples/umd-noconflict-no-exports/_expected/iife.js
@@ -0,0 +1,6 @@
+(function () {
+	'use strict';
+
+	console.log('no exports');
+
+}());
diff --git a/test/form/samples/umd-noconflict-no-exports/_expected/system.js b/test/form/samples/umd-noconflict-no-exports/_expected/system.js
new file mode 100644
index 00000000000..c2c56e78362
--- /dev/null
+++ b/test/form/samples/umd-noconflict-no-exports/_expected/system.js
@@ -0,0 +1,10 @@
+System.register('FooBar', [], function (exports, module) {
+	'use strict';
+	return {
+		execute: function () {
+
+			console.log('no exports');
+
+		}
+	};
+});
diff --git a/test/form/samples/umd-noconflict-no-exports/_expected/umd.js b/test/form/samples/umd-noconflict-no-exports/_expected/umd.js
new file mode 100644
index 00000000000..f4fcd62f66e
--- /dev/null
+++ b/test/form/samples/umd-noconflict-no-exports/_expected/umd.js
@@ -0,0 +1,15 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+	typeof define === 'function' && define.amd ? define(['exports'], factory) :
+	(function() {
+		var current = global.FooBar;
+		var exports = global.FooBar = {};
+		factory(exports);
+		global.FooBar = exports;
+		exports.noConflict = function() { global.FooBar = current; return exports; };
+	})();
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
+
+	console.log('no exports');
+
+}));
diff --git a/test/form/samples/umd-noconflict-no-exports/main.js b/test/form/samples/umd-noconflict-no-exports/main.js
new file mode 100644
index 00000000000..449280bb09a
--- /dev/null
+++ b/test/form/samples/umd-noconflict-no-exports/main.js
@@ -0,0 +1 @@
+console.log('no exports');
diff --git a/test/form/samples/umd-noconflict/_expected/umd.js b/test/form/samples/umd-noconflict/_expected/umd.js
index 060ddcd4e69..c95170f12cc 100644
--- a/test/form/samples/umd-noconflict/_expected/umd.js
+++ b/test/form/samples/umd-noconflict/_expected/umd.js
@@ -3,12 +3,12 @@
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
 	(function() {
 		var current = global.FooBar;
-		var exports = (global.FooBar = {});
+		var exports = global.FooBar = {};
 		factory(exports);
 		global.FooBar = exports;
 		exports.noConflict = function() { global.FooBar = current; return exports; };
 	})();
-}(this, (function (exports) { 'use strict';
+}(typeof self !== 'undefined' ? self : this, function (exports) { 'use strict';
 
 	function doThings() {
 		console.log( 'doing things...' );
@@ -24,4 +24,4 @@
 
 	Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
diff --git a/test/form/samples/unmodified-default-exports-function-argument/_expected/umd.js b/test/form/samples/unmodified-default-exports-function-argument/_expected/umd.js
index 81d4424b9bc..9b7cca96402 100644
--- a/test/form/samples/unmodified-default-exports-function-argument/_expected/umd.js
+++ b/test/form/samples/unmodified-default-exports-function-argument/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var foo = function () {
 		return 42;
@@ -17,4 +16,4 @@
 
 	console.log( answer );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/unmodified-default-exports/_expected/umd.js b/test/form/samples/unmodified-default-exports/_expected/umd.js
index e16d656ea3b..63338585029 100644
--- a/test/form/samples/unmodified-default-exports/_expected/umd.js
+++ b/test/form/samples/unmodified-default-exports/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var Foo = function () {
 		console.log( 'side effect' );
@@ -17,4 +16,4 @@
 
 	var foo = new Foo();
 
-})));
+}));
diff --git a/test/form/samples/unused-called-import/_expected/umd.js b/test/form/samples/unused-called-import/_expected/umd.js
index d6284bf8950..b8692061427 100644
--- a/test/form/samples/unused-called-import/_expected/umd.js
+++ b/test/form/samples/unused-called-import/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo() { return 'foo'; }
 
 	assert.equal( foo(), 'foo' );
 
-})));
+}));
diff --git a/test/form/samples/unused-called-with-side-effects/_expected/umd.js b/test/form/samples/unused-called-with-side-effects/_expected/umd.js
index e3ea51f9025..31e137733f9 100644
--- a/test/form/samples/unused-called-with-side-effects/_expected/umd.js
+++ b/test/form/samples/unused-called-with-side-effects/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
   typeof define === 'function' && define.amd ? define(factory) :
-  (factory());
-}(this, (function () { 'use strict';
+  factory();
+}(function () { 'use strict';
 
   function foo() {
     return 'foo'
@@ -10,4 +9,4 @@
 
   assert.equal( foo(), 'foo' );
 
-})));
+}));
diff --git a/test/form/samples/unused-default-exports/_expected/umd.js b/test/form/samples/unused-default-exports/_expected/umd.js
index b38f629a8c4..7d57cbedca7 100644
--- a/test/form/samples/unused-default-exports/_expected/umd.js
+++ b/test/form/samples/unused-default-exports/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var foo = { value: 1 };
 
@@ -15,4 +14,4 @@
 
 	assert.equal( foo.value, 2 );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/unused-function-and-class-expressions/_expected/umd.js b/test/form/samples/unused-function-and-class-expressions/_expected/umd.js
index 2498f7e682b..454d260bd21 100644
--- a/test/form/samples/unused-function-and-class-expressions/_expected/umd.js
+++ b/test/form/samples/unused-function-and-class-expressions/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function foo() {
 		console.log("foo");
@@ -10,4 +9,4 @@
 
 	foo();
 
-})));
+}));
diff --git a/test/form/samples/unused-import/_expected/umd.js b/test/form/samples/unused-import/_expected/umd.js
index 6155f5f46a4..1d285d4b77f 100644
--- a/test/form/samples/unused-import/_expected/umd.js
+++ b/test/form/samples/unused-import/_expected/umd.js
@@ -1,9 +1,8 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('external')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['external'], factory) :
-	(factory(global.external));
-}(this, (function (external) { 'use strict';
+	factory(global.external);
+}(function (external) { 'use strict';
 
 
 
-})));
+}));
diff --git a/test/form/samples/unused-inner-functions-and-classes/_expected/umd.js b/test/form/samples/unused-inner-functions-and-classes/_expected/umd.js
index d78b0c51b09..839fdc5938e 100644
--- a/test/form/samples/unused-inner-functions-and-classes/_expected/umd.js
+++ b/test/form/samples/unused-inner-functions-and-classes/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
     typeof define === 'function' && define.amd ? define(factory) :
-    (factory());
-}(this, (function () { 'use strict';
+    factory();
+}(function () { 'use strict';
 
     function bar () { console.log("outer bar"); }
 
@@ -24,4 +23,4 @@
 
     console.log( getClass().name );
 
-})));
+}));
diff --git a/test/form/samples/unused-var/_expected/iife.js b/test/form/samples/unused-var/_expected/iife.js
index a9b45dfc7b0..e50863df51f 100644
--- a/test/form/samples/unused-var/_expected/iife.js
+++ b/test/form/samples/unused-var/_expected/iife.js
@@ -5,4 +5,4 @@
 
 	console.log( foo );
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/unused-var/_expected/umd.js b/test/form/samples/unused-var/_expected/umd.js
index 71ba44f5d47..c45fcdacb93 100644
--- a/test/form/samples/unused-var/_expected/umd.js
+++ b/test/form/samples/unused-var/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	var foo = 'lol';
 
 	console.log( foo );
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/update-expression-side-effects/_expected/umd.js b/test/form/samples/update-expression-side-effects/_expected/umd.js
index 68ba4244062..73c07651834 100644
--- a/test/form/samples/update-expression-side-effects/_expected/umd.js
+++ b/test/form/samples/update-expression-side-effects/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const effectY = () => {
 		console.log('effect');
@@ -16,4 +15,4 @@
 	foo++;
 	foo.bar.baz = 1;
 
-})));
+}));
diff --git a/test/form/samples/url-external/_expected/umd.js b/test/form/samples/url-external/_expected/umd.js
index 99510c5b60f..d4a2cbbd06f 100644
--- a/test/form/samples/url-external/_expected/umd.js
+++ b/test/form/samples/url-external/_expected/umd.js
@@ -1,11 +1,10 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('https://external.com/external.js')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['https://external.com/external.js'], factory) :
-	(factory(global.external));
-}(this, (function (external) { 'use strict';
+	factory(global.external);
+}(function (external) { 'use strict';
 
 	external = external && external.hasOwnProperty('default') ? external['default'] : external;
 
 	console.log(external);
 
-})));
+}));
diff --git a/test/form/samples/use-global-map-for-export-name/_expected/umd.js b/test/form/samples/use-global-map-for-export-name/_expected/umd.js
index 47e48e577f5..8bf1eb36806 100644
--- a/test/form/samples/use-global-map-for-export-name/_expected/umd.js
+++ b/test/form/samples/use-global-map-for-export-name/_expected/umd.js
@@ -1,12 +1,11 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('leaflet')) :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(['leaflet'], factory) :
-	(factory(global.L));
-}(this, (function (L) { 'use strict';
+	factory(global.L);
+}(function (L) { 'use strict';
 
 	L = L && L.hasOwnProperty('default') ? L['default'] : L;
 
 	L.terminator = function(options) {
 	};
 
-})));
+}));
diff --git a/test/form/samples/whitespace-around-namespace-member-expression/_expected/iife.js b/test/form/samples/whitespace-around-namespace-member-expression/_expected/iife.js
index 5a0d9202131..d776c9d75fe 100644
--- a/test/form/samples/whitespace-around-namespace-member-expression/_expected/iife.js
+++ b/test/form/samples/whitespace-around-namespace-member-expression/_expected/iife.js
@@ -7,4 +7,4 @@
 
 	yar();
 
-}());
\ No newline at end of file
+}());
diff --git a/test/form/samples/whitespace-around-namespace-member-expression/_expected/umd.js b/test/form/samples/whitespace-around-namespace-member-expression/_expected/umd.js
index e260775a114..17424f15ca6 100644
--- a/test/form/samples/whitespace-around-namespace-member-expression/_expected/umd.js
+++ b/test/form/samples/whitespace-around-namespace-member-expression/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	function yar() {
 		console.log('yar?');
@@ -10,4 +9,4 @@
 
 	yar();
 
-})));
\ No newline at end of file
+}));
diff --git a/test/form/samples/wrap-simplified-expressions/_expected/umd.js b/test/form/samples/wrap-simplified-expressions/_expected/umd.js
index e92a7203b82..6c6a08f7c8b 100644
--- a/test/form/samples/wrap-simplified-expressions/_expected/umd.js
+++ b/test/form/samples/wrap-simplified-expressions/_expected/umd.js
@@ -1,8 +1,7 @@
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+(function (factory) {
 	typeof define === 'function' && define.amd ? define(factory) :
-	(factory());
-}(this, (function () { 'use strict';
+	factory();
+}(function () { 'use strict';
 
 	const wrapper = {
 		foo() {
@@ -30,4 +29,4 @@
 
 	testEval.call('test');
 
-})));
+}));
diff --git a/test/function/samples/supports-compact-umd-in-node/_config.js b/test/function/samples/supports-compact-umd-in-node/_config.js
new file mode 100644
index 00000000000..0e248b032ee
--- /dev/null
+++ b/test/function/samples/supports-compact-umd-in-node/_config.js
@@ -0,0 +1,11 @@
+const assert = require('assert');
+
+module.exports = {
+	description: 'umd output works in node',
+	options: {
+		output: { format: 'umd', name: 'bundle', compact: true }
+	},
+	exports(exports) {
+		assert.equal(exports.x, 'y');
+	}
+};
diff --git a/test/function/samples/supports-compact-umd-in-node/main.js b/test/function/samples/supports-compact-umd-in-node/main.js
new file mode 100644
index 00000000000..574c8636455
--- /dev/null
+++ b/test/function/samples/supports-compact-umd-in-node/main.js
@@ -0,0 +1,3 @@
+const x = 'y';
+
+export {x};
diff --git a/test/function/samples/supports-umd-in-node/_config.js b/test/function/samples/supports-umd-in-node/_config.js
new file mode 100644
index 00000000000..39b2fc87621
--- /dev/null
+++ b/test/function/samples/supports-umd-in-node/_config.js
@@ -0,0 +1,11 @@
+const assert = require('assert');
+
+module.exports = {
+	description: 'umd output works in node',
+	options: {
+		output: { format: 'umd', name: 'bundle' }
+	},
+	exports(exports) {
+		assert.equal(exports.x, 'y');
+	}
+};
diff --git a/test/function/samples/supports-umd-in-node/main.js b/test/function/samples/supports-umd-in-node/main.js
new file mode 100644
index 00000000000..574c8636455
--- /dev/null
+++ b/test/function/samples/supports-umd-in-node/main.js
@@ -0,0 +1,3 @@
+const x = 'y';
+
+export {x};
diff --git a/test/sourcemaps/samples/render-chunk-babili/babili-results.js b/test/sourcemaps/samples/render-chunk-babili/babili-results.js
index 80447fc293c..765981f3528 100644
--- a/test/sourcemaps/samples/render-chunk-babili/babili-results.js
+++ b/test/sourcemaps/samples/render-chunk-babili/babili-results.js
@@ -2,4 +2,4 @@ exports.amd = {"code":"define(function(){'use strict';console.log(42)});","map":
 exports.cjs = {"code":"'use strict';console.log(42);","map":{"version":3,"sources":["unknown"],"names":["console","log"],"mappings":"AAAA,aAEAA,QAAQC,GAAR,CAAa,EAAb,C","file":"unknown","sourcesContent":["'use strict';\n\nconsole.log( 42 );"]}};
 exports.es = {"code":"console.log(42);","map":{"version":3,"sources":["unknown"],"names":["console","log"],"mappings":"AAAAA,QAAQC,GAAR,CAAa,EAAb,C","file":"unknown","sourcesContent":["console.log( 42 );"]}};
 exports.iife = {"code":"(function(){'use strict';console.log(42)})();","map":{"version":3,"sources":["unknown"],"names":["console","log"],"mappings":"AAAC,WAAY,CACb,aAEAA,QAAQC,GAAR,CAAa,EAAb,CAEC,CALA,G","file":"unknown","sourcesContent":["(function () {\n'use strict';\n\nconsole.log( 42 );\n\n}());"]}};
-exports.umd = {"code":"(function(a,b){'object'==typeof exports&&'undefined'!=typeof module?b():'function'==typeof define&&define.amd?define(b):b()})(this,function(){'use strict';console.log(42)});","map":{"version":3,"sources":["unknown"],"names":["global","factory","exports","module","define","amd","console","log"],"mappings":"AAAC,UAAUA,CAAV,CAAkBC,CAAlB,CAA2B,CACR,QAAnB,QAAOC,QAAP,EAAiD,WAAlB,QAAOC,OAAtC,CAA+DF,GAA/D,CACkB,UAAlB,QAAOG,OAAP,EAAgCA,OAAOC,GAAvC,CAA6CD,OAAOH,CAAP,CAA7C,CACCA,GACD,CAJA,EAIC,IAJD,CAIQ,UAAY,CAAE,aAEvBK,QAAQC,GAAR,CAAa,EAAb,CAEC,CARA,C","file":"unknown","sourcesContent":["(function (global, factory) {\n\ttypeof exports === 'object' && typeof module !== 'undefined' ? factory() :\n\ttypeof define === 'function' && define.amd ? define(factory) :\n\t(factory());\n}(this, (function () { 'use strict';\n\nconsole.log( 42 );\n\n})));"]}};
+exports.umd = {"code":"(function(a){'function'==typeof define&&define.amd?define(a):a()})(function(){'use strict';console.log(42)});","map":{"version":3,"sources":["unknown"],"names":["define","amd","console","log"],"mappings":"AAAC,YAAmB,CACF,UAAlB,QAAOA,OAAP,EAAgCA,OAAOC,GAAvC,CAA6CD,SAA7C,CACA,GACC,CAHA,EAGC,UAAY,CAAE,aAEhBE,QAAQC,GAAR,CAAa,EAAb,CAEC,CAPA,C","file":"main.js","sourcesContent":["(function (factory) {\ntypeof define === 'function' && define.amd ? define(factory) :\nfactory();\n}(function () { 'use strict';\n\nconsole.log( 42 );\n\n}));\n"]}};
diff --git a/test/sourcemaps/samples/transform-bundle-babili/babili-results.js b/test/sourcemaps/samples/transform-bundle-babili/babili-results.js
index 80447fc293c..765981f3528 100644
--- a/test/sourcemaps/samples/transform-bundle-babili/babili-results.js
+++ b/test/sourcemaps/samples/transform-bundle-babili/babili-results.js
@@ -2,4 +2,4 @@ exports.amd = {"code":"define(function(){'use strict';console.log(42)});","map":
 exports.cjs = {"code":"'use strict';console.log(42);","map":{"version":3,"sources":["unknown"],"names":["console","log"],"mappings":"AAAA,aAEAA,QAAQC,GAAR,CAAa,EAAb,C","file":"unknown","sourcesContent":["'use strict';\n\nconsole.log( 42 );"]}};
 exports.es = {"code":"console.log(42);","map":{"version":3,"sources":["unknown"],"names":["console","log"],"mappings":"AAAAA,QAAQC,GAAR,CAAa,EAAb,C","file":"unknown","sourcesContent":["console.log( 42 );"]}};
 exports.iife = {"code":"(function(){'use strict';console.log(42)})();","map":{"version":3,"sources":["unknown"],"names":["console","log"],"mappings":"AAAC,WAAY,CACb,aAEAA,QAAQC,GAAR,CAAa,EAAb,CAEC,CALA,G","file":"unknown","sourcesContent":["(function () {\n'use strict';\n\nconsole.log( 42 );\n\n}());"]}};
-exports.umd = {"code":"(function(a,b){'object'==typeof exports&&'undefined'!=typeof module?b():'function'==typeof define&&define.amd?define(b):b()})(this,function(){'use strict';console.log(42)});","map":{"version":3,"sources":["unknown"],"names":["global","factory","exports","module","define","amd","console","log"],"mappings":"AAAC,UAAUA,CAAV,CAAkBC,CAAlB,CAA2B,CACR,QAAnB,QAAOC,QAAP,EAAiD,WAAlB,QAAOC,OAAtC,CAA+DF,GAA/D,CACkB,UAAlB,QAAOG,OAAP,EAAgCA,OAAOC,GAAvC,CAA6CD,OAAOH,CAAP,CAA7C,CACCA,GACD,CAJA,EAIC,IAJD,CAIQ,UAAY,CAAE,aAEvBK,QAAQC,GAAR,CAAa,EAAb,CAEC,CARA,C","file":"unknown","sourcesContent":["(function (global, factory) {\n\ttypeof exports === 'object' && typeof module !== 'undefined' ? factory() :\n\ttypeof define === 'function' && define.amd ? define(factory) :\n\t(factory());\n}(this, (function () { 'use strict';\n\nconsole.log( 42 );\n\n})));"]}};
+exports.umd = {"code":"(function(a){'function'==typeof define&&define.amd?define(a):a()})(function(){'use strict';console.log(42)});","map":{"version":3,"sources":["unknown"],"names":["define","amd","console","log"],"mappings":"AAAC,YAAmB,CACF,UAAlB,QAAOA,OAAP,EAAgCA,OAAOC,GAAvC,CAA6CD,SAA7C,CACA,GACC,CAHA,EAGC,UAAY,CAAE,aAEhBE,QAAQC,GAAR,CAAa,EAAb,CAEC,CAPA,C","file":"main.js","sourcesContent":["(function (factory) {\ntypeof define === 'function' && define.amd ? define(factory) :\nfactory();\n}(function () { 'use strict';\n\nconsole.log( 42 );\n\n}));\n"]}};