diff --git a/src/finalisers/amd.ts b/src/finalisers/amd.ts
index 3a8c32a61c7..d1d838d7cce 100644
--- a/src/finalisers/amd.ts
+++ b/src/finalisers/amd.ts
@@ -37,7 +37,7 @@ export default function amd(
 	warnOnBuiltins(warn, dependencies);
 	const deps = dependencies.map(m => `'${removeExtensionFromRelativeAmdId(m.id)}'`);
 	const args = dependencies.map(m => m.name);
-	const { n, getFunctionIntro, _ } = snippets;
+	const { n, getNonArrowFunctionIntro, _ } = snippets;
 
 	if (namedExportsMode && hasExports) {
 		args.unshift(`exports`);
@@ -99,7 +99,7 @@ export default function amd(
 			// factory function should be wrapped by parentheses to avoid lazy parsing,
 			// cf. https://v8.dev/blog/preparser#pife
 			.prepend(
-				`${amd.define}(${params}(${getFunctionIntro(args, {
+				`${amd.define}(${params}(${getNonArrowFunctionIntro(args, {
 					isAsync: false,
 					name: null
 				})}{${useStrict}${n}${n}`
diff --git a/src/finalisers/iife.ts b/src/finalisers/iife.ts
index 9e22e9b44d9..80d276e80cc 100644
--- a/src/finalisers/iife.ts
+++ b/src/finalisers/iife.ts
@@ -38,7 +38,7 @@ export default function iife(
 		strict
 	}: NormalizedOutputOptions
 ): Bundle {
-	const { _, getFunctionIntro, getPropertyAccess, n } = snippets;
+	const { _, getNonArrowFunctionIntro, getPropertyAccess, n } = snippets;
 	const isNamespaced = name && name.indexOf('.') !== -1;
 	const useVariableAssignment = !extend && !isNamespaced;
 
@@ -90,7 +90,7 @@ export default function iife(
 	);
 	magicString.prepend(`${intro}${interopBlock}`);
 
-	let wrapperIntro = `(${getFunctionIntro(args, {
+	let wrapperIntro = `(${getNonArrowFunctionIntro(args, {
 		isAsync: false,
 		name: null
 	})}{${n}${useStrict}${n}`;
diff --git a/src/finalisers/system.ts b/src/finalisers/system.ts
index 776f698bf30..fc5ca91cc1d 100644
--- a/src/finalisers/system.ts
+++ b/src/finalisers/system.ts
@@ -21,7 +21,7 @@ export default function system(
 	}: FinaliserOptions,
 	options: NormalizedOutputOptions
 ): Bundle {
-	const { _, getFunctionIntro, n, s } = snippets;
+	const { _, getFunctionIntro, getNonArrowFunctionIntro, n, s } = snippets;
 	const { importBindings, setters, starExcludes } = analyzeDependencies(
 		dependencies,
 		exports,
@@ -41,7 +41,7 @@ export default function system(
 	let wrapperStart =
 		`System.register(${registeredName}[` +
 		dependencies.map(({ id }) => `'${id}'`).join(`,${_}`) +
-		`],${_}(${getFunctionIntro(wrapperParams, { isAsync: false, name: null })}{${n}${t}${
+		`],${_}(${getNonArrowFunctionIntro(wrapperParams, { isAsync: false, name: null })}{${n}${t}${
 			options.strict ? "'use strict';" : ''
 		}` +
 		getStarExcludesBlock(starExcludes, varOrConst, t, snippets) +
@@ -51,19 +51,19 @@ export default function system(
 				? `${n}${t}${t}setters:${_}[${setters
 						.map(setter =>
 							setter
-								? `(${getFunctionIntro(['module'], {
+								? `${getFunctionIntro(['module'], {
 										isAsync: false,
 										name: null
-								  })}{${n}${t}${t}${t}${setter}${n}${t}${t}})`
+								  })}{${n}${t}${t}${t}${setter}${n}${t}${t}}`
 								: options.systemNullSetters
 								? `null`
-								: `function${_}()${_}{}`
+								: `${getFunctionIntro([], { isAsync: false, name: null })}{}`
 						)
 						.join(`,${_}`)}],`
 				: ''
 		}${n}`;
 	wrapperStart +=
-		`${t}${t}execute:${_}(${getFunctionIntro([], {
+		`${t}${t}execute:${_}(${getNonArrowFunctionIntro([], {
 			isAsync: usesTopLevelAwait,
 			name: null
 		})}{${n}${n}` + getHoistedExportsBlock(exports, t, snippets);
diff --git a/src/finalisers/umd.ts b/src/finalisers/umd.ts
index a61118e9f40..b5c46c27275 100644
--- a/src/finalisers/umd.ts
+++ b/src/finalisers/umd.ts
@@ -59,7 +59,7 @@ export default function umd(
 		strict
 	}: NormalizedOutputOptions
 ): Bundle {
-	const { _, getFunctionIntro, getPropertyAccess, n, s } = snippets;
+	const { _, getNonArrowFunctionIntro, getPropertyAccess, n, s } = snippets;
 	const factoryVar = compact ? 'f' : 'factory';
 	const globalVar = compact ? 'g' : 'global';
 
@@ -164,13 +164,13 @@ export default function umd(
 		: '';
 
 	const wrapperIntro =
-		`(${getFunctionIntro(wrapperParams, { isAsync: false, name: null })}{${n}` +
+		`(${getNonArrowFunctionIntro(wrapperParams, { isAsync: false, name: null })}{${n}` +
 		cjsIntro +
 		`${t}typeof ${define}${_}===${_}'function'${_}&&${_}${define}.amd${_}?${_}${define}(${amdParams}${factoryVar})${_}:${n}` +
 		`${t}${iifeStart}${iifeExport}${iifeEnd};${n}` +
 		// factory function should be wrapped by parentheses to avoid lazy parsing,
 		// cf. https://v8.dev/blog/preparser#pife
-		`})(${globalArg}(${getFunctionIntro(factoryParams, {
+		`})(${globalArg}(${getNonArrowFunctionIntro(factoryParams, {
 			isAsync: false,
 			name: null
 		})}{${useStrict}${n}`;
diff --git a/src/utils/generateCodeSnippets.ts b/src/utils/generateCodeSnippets.ts
index 6d94470e7fd..13302bcc98c 100644
--- a/src/utils/generateCodeSnippets.ts
+++ b/src/utils/generateCodeSnippets.ts
@@ -21,6 +21,10 @@ export interface GenerateCodeSnippets {
 		}
 	): string;
 	getFunctionIntro(params: string[], options: { isAsync: boolean; name: string | null }): string;
+	getNonArrowFunctionIntro(
+		params: string[],
+		options: { isAsync: boolean; name: string | null }
+	): string;
 	getObject(
 		fields: [key: string | null, value: string][],
 		options: { indent: string; lineBreaks: boolean }
@@ -36,6 +40,11 @@ export function getGenerateCodeSnippets({
 }: NormalizedOutputOptions): GenerateCodeSnippets {
 	const { _, n, s } = compact ? { _: '', n: '', s: '' } : { _: ' ', n: '\n', s: ';' };
 	const cnst = blockBindings || preferConst ? 'const' : 'var';
+	const getNonArrowFunctionIntro: GenerateCodeSnippets['getNonArrowFunctionIntro'] = (
+		params,
+		{ isAsync, name }
+	) =>
+		`${isAsync ? `async ` : ''}function${name ? ` ${name}` : ''}${_}(${params.join(`,${_}`)})${_}`;
 
 	const getFunctionIntro: GenerateCodeSnippets['getFunctionIntro'] = arrowFunctions
 		? (params, { isAsync, name }) => {
@@ -45,10 +54,7 @@ export function getGenerateCodeSnippets({
 					singleParam ? params[0] : `(${params.join(`,${_}`)})`
 				}${_}=>${_}`;
 		  }
-		: (params, { isAsync, name }) =>
-				`${isAsync ? `async ` : ''}function${name ? ` ${name}` : ''}${_}(${params.join(
-					`,${_}`
-				)})${_}`;
+		: getNonArrowFunctionIntro;
 
 	const getDirectReturnFunctionLeft: GenerateCodeSnippets['getDirectReturnFunctionLeft'] = (
 		params,
@@ -82,6 +88,7 @@ export function getGenerateCodeSnippets({
 				arrowFunctions || needsWrappedFunction
 			)}(`,
 		getFunctionIntro,
+		getNonArrowFunctionIntro,
 		getObject(fields, { indent, lineBreaks }) {
 			const prefix = `${lineBreaks ? n : ''}${indent}`;
 			return `{${fields
diff --git a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/generated-dep.js b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/generated-dep.js
index 10c118ff160..eb63c119b54 100644
--- a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/generated-dep.js
+++ b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/generated-dep.js
@@ -2,9 +2,9 @@ System.register(['lib'], (function (exports) {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			var dep = exports('d', 2 * value);
diff --git a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/main1.js b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/main1.js
index a3ed7c0b649..a687f08cdc6 100644
--- a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/main1.js
+++ b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var dep;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			dep = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main1', dep);
diff --git a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/main2.js b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/main2.js
index 42ebc967c47..7c542187ce1 100644
--- a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/main2.js
+++ b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var dep;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			dep = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main2', dep);
diff --git a/test/chunking-form/samples/basic-chunking/_expected/system/main1.js b/test/chunking-form/samples/basic-chunking/_expected/system/main1.js
index 8b80bd18cee..cde21f7336b 100644
--- a/test/chunking-form/samples/basic-chunking/_expected/system/main1.js
+++ b/test/chunking-form/samples/basic-chunking/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep2.js'], (function (exports) {
   'use strict';
   var fn$1;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$1 = module.f;
-    })],
+    }],
     execute: (function () {
 
       function fn () {
diff --git a/test/chunking-form/samples/basic-chunking/_expected/system/main2.js b/test/chunking-form/samples/basic-chunking/_expected/system/main2.js
index f0f8edd8fea..32e84972ece 100644
--- a/test/chunking-form/samples/basic-chunking/_expected/system/main2.js
+++ b/test/chunking-form/samples/basic-chunking/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep2.js'], (function (exports) {
   'use strict';
   var fn$2;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$2 = module.f;
-    })],
+    }],
     execute: (function () {
 
       function fn$1 () {
diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-shared2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-shared2.js
index 29356e48eff..9c019853a7b 100644
--- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-shared2.js
+++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-shared2.js
@@ -2,11 +2,11 @@ System.register(['./generated-dep1.js', './generated-dep2.js'], (function (expor
 	'use strict';
 	var x$1, x$2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			x$1 = module.x;
-		}), (function (module) {
+		}, function (module) {
 			x$2 = module.x;
-		})],
+		}],
 		execute: (function () {
 
 			var x = exports('x', x$1 + 1);
diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js
index 495895d5144..db46e711a0f 100644
--- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js
@@ -2,10 +2,10 @@ System.register(['./generated-shared2.js', './generated-dep1.js', './generated-d
 	'use strict';
 	var x, y;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			x = module.x;
 			y = module.y;
-		}), function () {}, function () {}],
+		}, function () {}, function () {}],
 		execute: (function () {
 
 			console.log(x + y);
diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js
index e679cfdf6aa..cd576bfb605 100644
--- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep11.js', './generated-dep112.js', './generated-d
 	'use strict';
 	var x;
 	return {
-		setters: [function () {}, (function (module) {
+		setters: [function () {}, function (module) {
 			x = module.x;
-		}), function () {}],
+		}, function () {}],
 		execute: (function () {
 
 			console.log('1');
diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js
index 3149aad4be8..0d1e2760566 100644
--- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep1.js'], (function (exports) {
   'use strict';
   var fn;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn = module.f;
-    })],
+    }],
     execute: (function () {
 
       class Main1 {
diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js
index 6f647e764fa..98306493d01 100644
--- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep1.js'], (function (exports) {
   'use strict';
   var fn;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn = module.a;
-    })],
+    }],
     execute: (function () {
 
       class Main2 {
diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main1.js
index 5963e667932..39a19bdbbc4 100644
--- a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main1.js
@@ -1,9 +1,9 @@
 System.register(['./generated-one.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('ItemOne', module.O);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js
index 3b814899f69..f50e9c3d295 100644
--- a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-one.js'], (function (exports) {
     'use strict';
     var ONE_CONSTANT;
     return {
-        setters: [(function (module) {
+        setters: [function (module) {
             ONE_CONSTANT = module.a;
-        })],
+        }],
         execute: (function () {
 
             class Two {
diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main1.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main1.js
index 7ec9707c4cc..7fb718518ca 100644
--- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib.js'], (function () {
 	'use strict';
 	var emptyFunction;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			emptyFunction = module.e;
-		})],
+		}],
 		execute: (function () {
 
 			function fn() {
diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js
index d998d15dfc0..a3ad1dd0d66 100644
--- a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js
@@ -2,10 +2,10 @@ System.register(['./generated-dep1.js'], (function (exports) {
   'use strict';
   var fn, text;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn = module.f;
       text = module.t;
-    })],
+    }],
     execute: (function () {
 
       class Main1 {
diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js
index 086974bcd9d..cd8950cfa45 100644
--- a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js
@@ -2,10 +2,10 @@ System.register(['./generated-dep1.js'], (function (exports) {
   'use strict';
   var fn, text;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn = module.a;
       text = module.b;
-    })],
+    }],
     execute: (function () {
 
       class Main2 {
diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main1.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main1.js
index b2e4be19f76..b499c47c335 100644
--- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main1.js
@@ -2,10 +2,10 @@ System.register(['./generated-shared.js'], (function (exports) {
 	'use strict';
 	var commonjsGlobal, shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			commonjsGlobal = module.c;
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			commonjsGlobal.fn = d => d + 1;
diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main2.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main2.js
index 78492466616..6cb661e6749 100644
--- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-shared.js'], (function (exports) {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			var main2 = exports('default', shared.map(d => d + 2));
diff --git a/test/chunking-form/samples/chunk-naming/_expected/system/custom/entryC.js b/test/chunking-form/samples/chunk-naming/_expected/system/custom/entryC.js
index 0ad8384c555..dccd2b13e22 100644
--- a/test/chunking-form/samples/chunk-naming/_expected/system/custom/entryC.js
+++ b/test/chunking-form/samples/chunk-naming/_expected/system/custom/entryC.js
@@ -2,11 +2,11 @@ System.register(['../chunks/chunk.js', '../chunks/chunk3.js'], (function () {
 	'use strict';
 	var num, num$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			num = module.n;
-		}), (function (module) {
+		}, function (module) {
 			num$1 = module.n;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(num + num$1);
diff --git a/test/chunking-form/samples/chunk-naming/_expected/system/entryA.js b/test/chunking-form/samples/chunk-naming/_expected/system/entryA.js
index 58c8e707b2f..a95244123c3 100644
--- a/test/chunking-form/samples/chunk-naming/_expected/system/entryA.js
+++ b/test/chunking-form/samples/chunk-naming/_expected/system/entryA.js
@@ -2,11 +2,11 @@ System.register(['./chunks/chunk.js', './chunks/chunk2.js'], (function () {
 	'use strict';
 	var num, num$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			num = module.n;
-		}), (function (module) {
+		}, function (module) {
 			num$1 = module.n;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(num + num$1);
diff --git a/test/chunking-form/samples/chunk-naming/_expected/system/entryB.js b/test/chunking-form/samples/chunk-naming/_expected/system/entryB.js
index bb82bcf4333..5d87f3f0fcb 100644
--- a/test/chunking-form/samples/chunk-naming/_expected/system/entryB.js
+++ b/test/chunking-form/samples/chunk-naming/_expected/system/entryB.js
@@ -2,11 +2,11 @@ System.register(['./chunks/chunk2.js', './chunks/chunk3.js'], (function () {
 	'use strict';
 	var num, num$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			num = module.n;
-		}), (function (module) {
+		}, function (module) {
 			num$1 = module.n;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(num + num$1);
diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main1.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main1.js
index 836bd02c237..91d07818245 100644
--- a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main1.js
@@ -2,10 +2,10 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value, x;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
 			x = module.x;
-		})],
+		}],
 		execute: (function () {
 
 			[43].map(dep => console.log(dep, value, x));
diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main2.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main2.js
index 71a98f460df..3322223cc10 100644
--- a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			var dep = 44;
diff --git a/test/chunking-form/samples/chunking-compact/_expected/system/main1.js b/test/chunking-form/samples/chunking-compact/_expected/system/main1.js
index 7ee18255a26..a7353755c76 100644
--- a/test/chunking-form/samples/chunking-compact/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunking-compact/_expected/system/main1.js
@@ -1,4 +1,4 @@
-System.register(['./generated-dep2.js'],(function(exports){'use strict';var fn$1;return{setters:[(function(module){fn$1=module.f;})],execute:(function(){function fn () {
+System.register(['./generated-dep2.js'],(function(exports){'use strict';var fn$1;return{setters:[function(module){fn$1=module.f;}],execute:(function(){function fn () {
   console.log('dep1 fn');
 }class Main1 {
   constructor () {
diff --git a/test/chunking-form/samples/chunking-compact/_expected/system/main2.js b/test/chunking-form/samples/chunking-compact/_expected/system/main2.js
index 58ca170a61c..00bc9700b53 100644
--- a/test/chunking-form/samples/chunking-compact/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunking-compact/_expected/system/main2.js
@@ -1,4 +1,4 @@
-System.register(['./generated-dep2.js','external'],(function(exports){'use strict';var fn$3,fn$2;return{setters:[(function(module){fn$3=module.f;}),(function(module){fn$2=module.fn;})],execute:(function(){function fn$1 () {
+System.register(['./generated-dep2.js','external'],(function(exports){'use strict';var fn$3,fn$2;return{setters:[function(module){fn$3=module.f;},function(module){fn$2=module.fn;}],execute:(function(){function fn$1 () {
   console.log('lib1 fn');
   fn$2();
 }function fn () {
diff --git a/test/chunking-form/samples/chunking-externals/_expected/system/main1.js b/test/chunking-form/samples/chunking-externals/_expected/system/main1.js
index 8b80bd18cee..cde21f7336b 100644
--- a/test/chunking-form/samples/chunking-externals/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunking-externals/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep2.js'], (function (exports) {
   'use strict';
   var fn$1;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$1 = module.f;
-    })],
+    }],
     execute: (function () {
 
       function fn () {
diff --git a/test/chunking-form/samples/chunking-externals/_expected/system/main2.js b/test/chunking-form/samples/chunking-externals/_expected/system/main2.js
index 361d5cd7d73..eacd8a231e9 100644
--- a/test/chunking-form/samples/chunking-externals/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunking-externals/_expected/system/main2.js
@@ -2,11 +2,11 @@ System.register(['./generated-dep2.js', 'external'], (function (exports) {
   'use strict';
   var fn$3, fn$2;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$3 = module.f;
-    }), (function (module) {
+    }, function (module) {
       fn$2 = module.fn;
-    })],
+    }],
     execute: (function () {
 
       function fn$1 () {
diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js
index 50efc1aea88..3dd1177bb86 100644
--- a/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js
@@ -1,9 +1,9 @@
 System.register(['./generated-dep.js', 'external'], (function (exports) {
 	'use strict';
 	return {
-		setters: [function () {}, (function (module) {
+		setters: [function () {}, function (module) {
 			exports('dep', module.asdf);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js
index 50efc1aea88..3dd1177bb86 100644
--- a/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js
@@ -1,9 +1,9 @@
 System.register(['./generated-dep.js', 'external'], (function (exports) {
 	'use strict';
 	return {
-		setters: [function () {}, (function (module) {
+		setters: [function () {}, function (module) {
 			exports('dep', module.asdf);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js
index 8f205215185..343ac922167 100644
--- a/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep2.js'], (function (exports) {
   'use strict';
   var fn$1;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$1 = module.f;
-    })],
+    }],
     execute: (function () {
 
       function fn () {
diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js
index 9d564c5641b..9d58acdbde4 100644
--- a/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep2.js'], (function (exports) {
   'use strict';
   var fn$2;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$2 = module.f;
-    })],
+    }],
     execute: (function () {
 
       function fn$1 () {
diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js
index 042d116c040..f741f47dff7 100644
--- a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js
+++ b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js
@@ -2,17 +2,17 @@ System.register(['starexternal1', 'external1', './generated-dep.js', 'starextern
 	'use strict';
 	var _starExcludes = { main: 1, 'default': 1, e: 1, dep: 1 };
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			var setter = {};
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		}), (function (module) {
+		}, function (module) {
 			exports('e', module.e);
-		}), (function (module) {
+		}, function (module) {
 			exports('dep', module.d);
-		}), function () {}, function () {}],
+		}, function () {}, function () {}],
 		execute: (function () {
 
 			var main = exports('main', '1');
diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js
index eee5687d491..82958e64630 100644
--- a/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js
+++ b/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js
@@ -2,17 +2,17 @@ System.register(['./generated-dep.js', 'external2', 'starexternal2'], (function
 	'use strict';
 	var _starExcludes = { main: 1, 'default': 1, dep: 1, e: 1 };
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('dep', module.d);
-		}), (function (module) {
+		}, function (module) {
 			exports('e', module.e);
-		}), (function (module) {
+		}, function (module) {
 			var setter = {};
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		})],
+		}],
 		execute: (function () {
 
 			var main = exports('main', '2');
diff --git a/test/chunking-form/samples/circular-entry-points/_expected/system/main1.js b/test/chunking-form/samples/circular-entry-points/_expected/system/main1.js
index e1892197a9b..19ec4730a3e 100644
--- a/test/chunking-form/samples/circular-entry-points/_expected/system/main1.js
+++ b/test/chunking-form/samples/circular-entry-points/_expected/system/main1.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main1.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('p', module.a);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/circular-entry-points/_expected/system/main2.js b/test/chunking-form/samples/circular-entry-points/_expected/system/main2.js
index 606a5f0bb06..86186a21afe 100644
--- a/test/chunking-form/samples/circular-entry-points/_expected/system/main2.js
+++ b/test/chunking-form/samples/circular-entry-points/_expected/system/main2.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main1.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('p', module.p);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/circular-entry-points2/_expected/system/main1.js b/test/chunking-form/samples/circular-entry-points2/_expected/system/main1.js
index d01696ada30..c77b2a6e411 100644
--- a/test/chunking-form/samples/circular-entry-points2/_expected/system/main1.js
+++ b/test/chunking-form/samples/circular-entry-points2/_expected/system/main1.js
@@ -1,9 +1,9 @@
 System.register(['./main2.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('p', module.p2);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/system/main1.js b/test/chunking-form/samples/circular-entry-points3/_expected/system/main1.js
index e1892197a9b..19ec4730a3e 100644
--- a/test/chunking-form/samples/circular-entry-points3/_expected/system/main1.js
+++ b/test/chunking-form/samples/circular-entry-points3/_expected/system/main1.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main1.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('p', module.a);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/system/main2.js b/test/chunking-form/samples/circular-entry-points3/_expected/system/main2.js
index 055fde5d51f..1513b869d4c 100644
--- a/test/chunking-form/samples/circular-entry-points3/_expected/system/main2.js
+++ b/test/chunking-form/samples/circular-entry-points3/_expected/system/main2.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main1.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports({ p: module.p, p2: module.a });
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/system/main3.js b/test/chunking-form/samples/circular-entry-points3/_expected/system/main3.js
index ee29f83d526..4f1beabc737 100644
--- a/test/chunking-form/samples/circular-entry-points3/_expected/system/main3.js
+++ b/test/chunking-form/samples/circular-entry-points3/_expected/system/main3.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main1.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('C', module.C);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/system/generated-lib1.js b/test/chunking-form/samples/circular-manual-chunks/_expected/system/generated-lib1.js
index 520166b6e84..e68a1493955 100644
--- a/test/chunking-form/samples/circular-manual-chunks/_expected/system/generated-lib1.js
+++ b/test/chunking-form/samples/circular-manual-chunks/_expected/system/generated-lib1.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib2.js'], (function (exports) {
 	'use strict';
 	var lib2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib2 = module.l;
-		})],
+		}],
 		execute: (function () {
 
 			const lib1 = exports('l', 'lib1');
diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/system/generated-lib2.js b/test/chunking-form/samples/circular-manual-chunks/_expected/system/generated-lib2.js
index f7602a4270d..2fc94b38ef9 100644
--- a/test/chunking-form/samples/circular-manual-chunks/_expected/system/generated-lib2.js
+++ b/test/chunking-form/samples/circular-manual-chunks/_expected/system/generated-lib2.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib1.js'], (function (exports) {
 	'use strict';
 	var lib1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib1 = module.l;
-		})],
+		}],
 		execute: (function () {
 
 			const lib2 = exports('l', 'lib2');
diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js b/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js
index 804d28632bb..810aa3e2ba9 100644
--- a/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js
+++ b/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register(['./generated-lib1.js', './generated-lib2.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('lib1', module.l);
-		}), function () {}],
+		}, function () {}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/combined-namespace-reexport/_expected/system/main1.js b/test/chunking-form/samples/combined-namespace-reexport/_expected/system/main1.js
index 4d5e849481b..9f1bd782a98 100644
--- a/test/chunking-form/samples/combined-namespace-reexport/_expected/system/main1.js
+++ b/test/chunking-form/samples/combined-namespace-reexport/_expected/system/main1.js
@@ -2,10 +2,10 @@ System.register(['./generated-geometry.js'], (function () {
 	'use strict';
 	var volume, geometry;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			volume = module.v;
 			geometry = module.g;
-		})],
+		}],
 		execute: (function () {
 
 			var mod = /*#__PURE__*/Object.freeze({
diff --git a/test/chunking-form/samples/combined-namespace-reexport/_expected/system/main2.js b/test/chunking-form/samples/combined-namespace-reexport/_expected/system/main2.js
index c83b0c44036..15f9cf788f6 100644
--- a/test/chunking-form/samples/combined-namespace-reexport/_expected/system/main2.js
+++ b/test/chunking-form/samples/combined-namespace-reexport/_expected/system/main2.js
@@ -2,10 +2,10 @@ System.register(['./generated-geometry.js'], (function () {
 	'use strict';
 	var foo, bar;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.f;
 			bar = module.b;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, bar);
diff --git a/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js b/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js
index 737e032fe2b..6e9db33ac7a 100644
--- a/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js
+++ b/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var x;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			x = module.x;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(x);
diff --git a/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js b/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js
index 7c0cbbceb0e..280d07abb4c 100644
--- a/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js
+++ b/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var x$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			x$1 = module.x;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(x, x$1);
diff --git a/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/system/main.js b/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/system/main.js
index f8eaa0bb672..0f9f70e90e9 100644
--- a/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/system/main.js
+++ b/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./other.js'], (function (exports) {
 	'use strict';
 	var other;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			other = module;
-		})],
+		}],
 		execute: (function () {
 
 			var main = exports('default', other + "extended");
diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js
index b348ced5864..3868a331e1d 100644
--- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js
+++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-foo.js'], (function () {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.f;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, foo);
diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js
index b348ced5864..3868a331e1d 100644
--- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js
+++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-foo.js'], (function () {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.f;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, foo);
diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main1.js
index b348ced5864..3868a331e1d 100644
--- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main1.js
+++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-foo.js'], (function () {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.f;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, foo);
diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main2.js
index b348ced5864..3868a331e1d 100644
--- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main2.js
+++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-foo.js'], (function () {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.f;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, foo);
diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/system/main1.js b/test/chunking-form/samples/default-export-name-conflict/_expected/system/main1.js
index 0b66f5a15f6..a649760a11a 100644
--- a/test/chunking-form/samples/default-export-name-conflict/_expected/system/main1.js
+++ b/test/chunking-form/samples/default-export-name-conflict/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-module1.js'], (function () {
 	'use strict';
 	var firebase;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			firebase = module.f;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(firebase, firebase);
diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/system/main2.js b/test/chunking-form/samples/default-export-name-conflict/_expected/system/main2.js
index 0b66f5a15f6..a649760a11a 100644
--- a/test/chunking-form/samples/default-export-name-conflict/_expected/system/main2.js
+++ b/test/chunking-form/samples/default-export-name-conflict/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-module1.js'], (function () {
 	'use strict';
 	var firebase;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			firebase = module.f;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(firebase, firebase);
diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/system/main1.js b/test/chunking-form/samples/default-identifier-renaming/_expected/system/main1.js
index 9dd5643b00a..62733cad47f 100644
--- a/test/chunking-form/samples/default-identifier-renaming/_expected/system/main1.js
+++ b/test/chunking-form/samples/default-identifier-renaming/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-shared.js'], (function (exports) {
 	'use strict';
 	var data;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			data = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			var main1 = exports('default', data.map(d => d + 1));
diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/system/main2.js b/test/chunking-form/samples/default-identifier-renaming/_expected/system/main2.js
index 3c5db032821..34ac1c5fdcf 100644
--- a/test/chunking-form/samples/default-identifier-renaming/_expected/system/main2.js
+++ b/test/chunking-form/samples/default-identifier-renaming/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-shared.js'], (function (exports) {
 	'use strict';
 	var data;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			data = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			var main2 = exports('default', data.map(d => d + 2));
diff --git a/test/chunking-form/samples/default-reexport-namespace/_expected/system/main.js b/test/chunking-form/samples/default-reexport-namespace/_expected/system/main.js
index 4d48a15c2fb..208064fa85a 100644
--- a/test/chunking-form/samples/default-reexport-namespace/_expected/system/main.js
+++ b/test/chunking-form/samples/default-reexport-namespace/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./one.js'], (function (exports) {
 	'use strict';
 	var __icon__$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			__icon__$1 = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			const __icon__ = {};
diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/system/main.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/system/main.js
index 313d969404c..fc9155ecdac 100644
--- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/system/main.js
@@ -2,11 +2,11 @@ System.register(['./a.js', './one.js'], (function () {
 	'use strict';
 	var a, d;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			a = module.a;
-		}), (function (module) {
+		}, function (module) {
 			d = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(a + d);
diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/system/one.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/system/one.js
index d2612d0c60d..4819936a27b 100644
--- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/system/one.js
+++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/system/one.js
@@ -2,9 +2,9 @@ System.register(['./b.js'], (function (exports) {
 	'use strict';
 	var b;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			b = module.b;
-		})],
+		}],
 		execute: (function () {
 
 			const d = exports('d', b + 4);
diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/generated-lib1.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/generated-lib1.js
index 520166b6e84..e68a1493955 100644
--- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/generated-lib1.js
+++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/generated-lib1.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib2.js'], (function (exports) {
 	'use strict';
 	var lib2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib2 = module.l;
-		})],
+		}],
 		execute: (function () {
 
 			const lib1 = exports('l', 'lib1');
diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/generated-lib2.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/generated-lib2.js
index f7602a4270d..2fc94b38ef9 100644
--- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/generated-lib2.js
+++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/generated-lib2.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib1.js'], (function (exports) {
 	'use strict';
 	var lib1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib1 = module.l;
-		})],
+		}],
 		execute: (function () {
 
 			const lib2 = exports('l', 'lib2');
diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js
index 804d28632bb..810aa3e2ba9 100644
--- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register(['./generated-lib1.js', './generated-lib2.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('lib1', module.l);
-		}), function () {}],
+		}, function () {}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js
index fc181c7299a..f678780b7ba 100644
--- a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js
+++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js
@@ -2,9 +2,9 @@ System.register(['../main.js'], (function (exports, module) {
 	'use strict';
 	var showImage;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			showImage = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			var logo = new URL('../assets/logo2-6d5979e4.svg', module.meta.url).href;
diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/first-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/first-main.js
index bf683f62ee9..1901ed04d73 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/first-main.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/first-main.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main1', value);
diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/second-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/second-main.js
index bf683f62ee9..1901ed04d73 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/second-main.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/second-main.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main1', value);
diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-buildStart.js
index 33fc7328701..c21eed54dae 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-buildStart.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-buildStart.js
@@ -1,9 +1,9 @@
 System.register(['./generated-build-starter.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('buildStartValue', module.v);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/main.js
index 0ed3af7441d..55b718e43e0 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./generated-build-starter.js'], (function () {
 	'use strict';
 	var value, otherValue;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
 			otherValue = module.o;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main', value, otherValue);
diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/build-start.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/build-start.js
index c1e5c033df3..7db3b7616b1 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/build-start.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/build-start.js
@@ -2,9 +2,9 @@ System.register(['../generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('buildStart', value);
diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/transform.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/transform.js
index e1e6b1e4249..fd90ea1c2e9 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/transform.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/transform.js
@@ -2,9 +2,9 @@ System.register(['../generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('transform', value);
diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js
index 3b45d17d944..39150aad0de 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main', value);
diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js
index 0b26fa430d8..c73a318e3e4 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js
@@ -2,9 +2,9 @@ System.register(['./shared.js'], (function () {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			postMessage(`from worker: ${shared}`);
diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js
index 0e46f9364ed..cd37abb081f 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./chunks/shared.js'], (function (exports, module) {
   'use strict';
   var shared;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       shared = module.s;
-    })],
+    }],
     execute: (function () {
 
       const getWorkerMessage = () => new Promise(resolve => {
diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js
index b140a542215..88e721d4520 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js
@@ -2,10 +2,10 @@ System.register(['./shared.js'], (function () {
 	'use strict';
 	var size, color;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			size = module.s;
 			color = module.c;
-		})],
+		}],
 		execute: (function () {
 
 			registerPaint(
diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js
index 9b39699f084..69c57ed6000 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./chunks/shared.js'], (function (exports, module) {
 	'use strict';
 	var color, size;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			color = module.c;
 			size = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			CSS.paintWorklet.addModule(new URL('chunks/worklet.js', module.meta.url).href);
diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js
index 87bb9d21341..12a2c642f50 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('startBuild', value);
diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js
index 3b45d17d944..39150aad0de 100644
--- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main', value);
diff --git a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/system/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/system/generated-buildStart.js
index 33fc7328701..c21eed54dae 100644
--- a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/system/generated-buildStart.js
+++ b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/system/generated-buildStart.js
@@ -1,9 +1,9 @@
 System.register(['./generated-build-starter.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('buildStartValue', module.v);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/system/main.js
index 0ed3af7441d..55b718e43e0 100644
--- a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./generated-build-starter.js'], (function () {
 	'use strict';
 	var value, otherValue;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
 			otherValue = module.o;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main', value, otherValue);
diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/components/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/components/index.js
index 3caf276d071..d4a4217d31a 100644
--- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/components/index.js
+++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/components/index.js
@@ -2,10 +2,10 @@ System.register('bundle', ['./sub/index.js'], (function (exports) {
 	'use strict';
 	var bar;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			bar = module["default"];
 			exports('foo', module.foo);
-		})],
+		}],
 		execute: (function () {
 
 			const baz = exports('baz', { bar });
diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/main.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/main.js
index e7b6198bc5b..26be107a7a2 100644
--- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/main.js
@@ -1,11 +1,11 @@
 System.register('bundle', ['./components/index.js', './components/sub/index.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('baz', module.baz);
-		}), (function (module) {
+		}, function (module) {
 			exports('foo', module.foo);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js
index a7a10fd83fc..3ef2c8a6e50 100644
--- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js
+++ b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js
@@ -1,9 +1,9 @@
 System.register(['external-false'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js
index 18d7bcb907a..47585aa132c 100644
--- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js
+++ b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js
@@ -1,9 +1,9 @@
 System.register(['external-true'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/system/main1.js b/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/system/main1.js
index cb4535ebd5b..f189fb530a6 100644
--- a/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/system/main1.js
+++ b/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./main2.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.reexported;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main', value);
diff --git a/test/chunking-form/samples/deprecated/manual-chunks-dynamic-facades/_expected/system/main.js b/test/chunking-form/samples/deprecated/manual-chunks-dynamic-facades/_expected/system/main.js
index 729939ec7a8..f8bb41b07d8 100644
--- a/test/chunking-form/samples/deprecated/manual-chunks-dynamic-facades/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/manual-chunks-dynamic-facades/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./generated-dynamic.js'], (function (exports, module) {
 	'use strict';
 	var DEP;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			DEP = module.D;
-		})],
+		}],
 		execute: (function () {
 
 			Promise.all([module.import('./generated-dynamic.js').then(function (n) { return n.b; }), module.import('./generated-dynamic.js').then(function (n) { return n.d; }), module.import('./generated-dynamic.js').then(function (n) { return n.a; })]).then(
diff --git a/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/generated-deps2and3.js b/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/generated-deps2and3.js
index c48d3573ee8..a0867bcd984 100644
--- a/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/generated-deps2and3.js
+++ b/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/generated-deps2and3.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib1.js'], (function (exports) {
   'use strict';
   var fn$3;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$3 = module.f;
-    })],
+    }],
     execute: (function () {
 
       exports({
diff --git a/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/main.js b/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/main.js
index e8f88731c60..a1339e81333 100644
--- a/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./generated-deps2and3.js', './generated-lib1.js'], (function (
   'use strict';
   var fn$1, fn$2;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$1 = module.f;
       fn$2 = module.a;
-    }), function () {}],
+    }, function () {}],
     execute: (function () {
 
       function fn () {
diff --git a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/system/main.js b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/system/main.js
index 34d0c182252..85562809d93 100644
--- a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/system/main.js
@@ -2,12 +2,12 @@ System.register(['./dep1.js', './dep2.js'], (function () {
 	'use strict';
 	var _missingExportShim, _missingExportShim$1, _missingExportShim$2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			_missingExportShim = module.missing1;
-		}), (function (module) {
+		}, function (module) {
 			_missingExportShim$1 = module.missing2;
 			_missingExportShim$2 = module.previousShimmedExport;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(_missingExportShim, _missingExportShim$1, _missingExportShim$2);
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js
index 8fb19f5b2a1..359bf0ce6d7 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js
@@ -2,12 +2,12 @@ System.register(['./default.js', './named.js'], (function (exports, module) {
 	'use strict';
 	var foo, value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module["default"];
 			exports('default', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			value = module.value;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, value);
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js
index 3e401e08a53..0df36bf9a75 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js
@@ -2,11 +2,11 @@ System.register(['external', './other.js', './_virtual/other.js_commonjs-exports
 	'use strict';
 	var require$$0, other;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			require$$0 = module["default"];
-		}), function () {}, (function (module) {
+		}, function () {}, function (module) {
 			other = module.__exports;
-		})],
+		}],
 		execute: (function () {
 
 			const external = require$$0;
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js
index 094b5019f84..e0920e59542 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js
@@ -2,11 +2,11 @@ System.register(['./commonjs.js', 'external'], (function () {
 	'use strict';
 	var commonjs, require$$0;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			commonjs = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			require$$0 = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log(commonjs, require$$0);
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js
index d79a26cd9a8..0c908825185 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/other.js
@@ -2,10 +2,10 @@ System.register(['./_virtual/other.js_commonjs-exports'], (function (exports) {
 	'use strict';
 	var other;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			other = module.__exports;
 			exports('default', module.__exports);
-		})],
+		}],
 		execute: (function () {
 
 			other.value = 43;
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/m1.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/m1.js
index e82ee117d67..4151f28d873 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/m1.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/m1.js
@@ -1,11 +1,11 @@
 System.register(['./m2.js', './m3.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('m2', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('m3', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/main.js
index d062c6d2b33..2055d1533cc 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./m1.js'], (function () {
 	'use strict';
 	var m1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			m1 = module;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(m1);
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-empty/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-empty/_expected/system/main.js
index 851995c32dd..92dd66d8318 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-empty/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-empty/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./two.js'], (function () {
 	'use strict';
 	var a;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			a = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			window.APP = { a };
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/system/main1.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/system/main1.js
index b108a9ef094..ab503c81cbb 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/system/main1.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/system/main1.js
@@ -1,9 +1,9 @@
 System.register(['./dep.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports({ bar: module.foo, foo: module.foo });
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/system/main2.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/system/main2.js
index e81ad7416c2..47fbb8724e8 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/system/main2.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/system/main2.js
@@ -1,9 +1,9 @@
 System.register(['./dep.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('bar', module.foo);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js
index 11c9738e46d..cc19e2eedd3 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js
@@ -1,15 +1,15 @@
 System.register(['./entry-foo-system-ts.ts.js', './nested/entry-bar-system-ts.ts.js', './nested/entry-baz-system-ts.ts.js', './entry-no-ext-system-.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('foo', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('bar', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('baz', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('noExt', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/system/main.js
index b376f2a1e8b..1c73614dc6c 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/system/main.js
@@ -2,13 +2,13 @@ System.register(['./_virtual/_one.js', './_virtual/_One2.js', './_virtual/_One1.
 	'use strict';
 	var a, b, c;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			a = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			b = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			c = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			window.APP = { a, b, c };
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js
index 8fb19f5b2a1..359bf0ce6d7 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js
@@ -2,12 +2,12 @@ System.register(['./default.js', './named.js'], (function (exports, module) {
 	'use strict';
 	var foo, value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module["default"];
 			exports('default', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			value = module.value;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, value);
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/system/main.js
index 88bb8f5e770..ef257319d66 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/system/main.js
@@ -1,11 +1,11 @@
 System.register(['./module-a/v1/index.js', './module-b/v1/index.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('ModuleA_V1', module);
-		}), (function (module) {
+		}, function (module) {
 			exports('ModuleB_V1', module);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js
index 5da0687e70c..2f734b5c3b5 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register(['./inner/more_inner/something.js', './inner/some_effect.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('Something', module.Something);
-		}), function () {}],
+		}, function () {}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js
index 0d7bf980fa6..820cf65b907 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./dep2.js'], (function (exports) {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module["default"];
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/main.js
index e17c78ea005..d5764dd2de7 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['external'], (function () {
 	'use strict';
 	var path;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			path = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log(path.normalize('foo\\bar'));
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/proxy.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/proxy.js
index 5f2bfdcd16d..54718c7b73d 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/proxy.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/proxy.js
@@ -2,10 +2,10 @@ System.register(['external'], (function (exports) {
 	'use strict';
 	var path;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			path = module["default"];
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/system/lib/main.js b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/system/lib/main.js
index 2caf46e13e5..440f4c9f9c1 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/system/lib/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/system/lib/main.js
@@ -2,9 +2,9 @@ System.register(['../dep.js'], (function (exports) {
   'use strict';
   var fn;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn = module.fn;
-    })],
+    }],
     execute: (function () {
 
       class Main {
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/system/main.js
index d5d1a215302..f888ea474be 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/system/main.js
@@ -1,13 +1,13 @@
 System.register(['./answer.num.js', './lorem.str.js', './no-ext.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('answer', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('lorem', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('noExt', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/main.js
index 65160362233..eed2c557e47 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/main.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./_virtual/_virtualModule'], (function () {
 	'use strict';
 	var virtual;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			virtual = module.virtual;
-		})],
+		}],
 		execute: (function () {
 
 			assert.equal(virtual, 'Virtual!');
diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/deps/dep2.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/deps/dep2.js
index a5ab3c9b04b..266a74dbe31 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/deps/dep2.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/deps/dep2.js
@@ -2,9 +2,9 @@ System.register(['../lib/lib2.js'], (function (exports) {
   'use strict';
   var fn$1;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$1 = module.fn;
-    })],
+    }],
     execute: (function () {
 
       exports('fn', fn);
diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/deps/dep3.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/deps/dep3.js
index 77d78f6632d..c7293a4ee0a 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/deps/dep3.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/deps/dep3.js
@@ -2,9 +2,9 @@ System.register(['../lib/lib1.js'], (function (exports) {
   'use strict';
   var fn$1;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$1 = module.fn;
-    })],
+    }],
     execute: (function () {
 
       exports('fn', fn);
diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/main1.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/main1.js
index aa823fcd2ff..a8ee090a600 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/main1.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/main1.js
@@ -2,11 +2,11 @@ System.register(['./deps/dep1.js', './deps/dep2.js'], (function (exports) {
   'use strict';
   var fn, fn$1;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn = module.fn;
-    }), (function (module) {
+    }, function (module) {
       fn$1 = module.fn;
-    })],
+    }],
     execute: (function () {
 
       class Main1 {
diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/main2.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/main2.js
index 1a268cf99df..b2fe3e01268 100644
--- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/main2.js
+++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/system/main2.js
@@ -2,11 +2,11 @@ System.register(['./deps/dep2.js', './deps/dep3.js'], (function (exports) {
   'use strict';
   var fn$1, fn;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$1 = module.fn;
-    }), (function (module) {
+    }, function (module) {
       fn = module.fn;
-    })],
+    }],
     execute: (function () {
 
       class Main2 {
diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep2.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep2.js
index 9b0ce029fd3..c98eb8ea095 100644
--- a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep2.js
+++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep2.js
@@ -2,9 +2,9 @@ System.register(['./generated-main.js'], (function (exports) {
   'use strict';
   var multiplier;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       multiplier = module.m;
-    })],
+    }],
     execute: (function () {
 
       exports('mult', mult);
diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/system/main2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/system/main2.js
index 8a7c9547fa7..d0c0b3934a6 100644
--- a/test/chunking-form/samples/dynamic-import-facade/_expected/system/main2.js
+++ b/test/chunking-form/samples/dynamic-import-facade/_expected/system/main2.js
@@ -2,10 +2,10 @@ System.register(['./generated-dynamic.js'], (function () {
 	'use strict';
 	var dynamic, dep;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			dynamic = module.d;
 			dep = module.a;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main2', dynamic, dep);
diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main.js
index 20a08627a9f..293f7a4a3c5 100644
--- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main.js
+++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./generated-dep1.js'], (function () {
 	'use strict';
 	var foo, bar;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.f;
 			bar = module.b;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo(), bar());
diff --git a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/other.js b/test/chunking-form/samples/dynamic-import/_expected/system/chunks/other.js
index 185ceb9d2d8..753b17aae35 100644
--- a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/other.js
+++ b/test/chunking-form/samples/dynamic-import/_expected/system/chunks/other.js
@@ -1,9 +1,9 @@
 System.register(['./main.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('value', module.s);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/dynamic-import/_expected/system/main.js b/test/chunking-form/samples/dynamic-import/_expected/system/main.js
index 0ce8455896f..2bfff3f19f9 100644
--- a/test/chunking-form/samples/dynamic-import/_expected/system/main.js
+++ b/test/chunking-form/samples/dynamic-import/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register(['./chunks/main.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('promise', module.p);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/system/generated-dynamic.js b/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/system/generated-dynamic.js
index a7e99126954..6cf95b846da 100644
--- a/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/system/generated-dynamic.js
@@ -2,9 +2,9 @@ System.register(['./generated-main.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('dynamic', value);
diff --git a/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/system/main.js b/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/system/main.js
index 4ae841bbf07..65848d11765 100644
--- a/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/system/main.js
+++ b/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('promise', module.p);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/system/generated-dynamic.js b/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/system/generated-dynamic.js
index 9f320f71c3f..3b4cbaf6548 100644
--- a/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/system/generated-dynamic.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('dynamic', value);
diff --git a/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/system/generated-dynamic.js b/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/system/generated-dynamic.js
index 9f320f71c3f..3b4cbaf6548 100644
--- a/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/system/generated-dynamic.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('dynamic', value);
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/generated-buildStart.js
index 33fc7328701..c21eed54dae 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/generated-buildStart.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/generated-buildStart.js
@@ -1,9 +1,9 @@
 System.register(['./generated-build-starter.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('buildStartValue', module.v);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/main.js
index 0ed3af7441d..55b718e43e0 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/main.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./generated-build-starter.js'], (function () {
 	'use strict';
 	var value, otherValue;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
 			otherValue = module.o;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main', value, otherValue);
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js
index 0efc870c25c..b0fedf536ac 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js
@@ -1,9 +1,9 @@
 System.register(['../generated-buildStart.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('id', module.i);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js
index 666d88a8311..1c51c855e95 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./generated-buildStart.js'], (function () {
 	'use strict';
 	var id, value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			id = module.i;
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(id);
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/mainChunk.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/mainChunk.js
index e43520272b1..11058497608 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/mainChunk.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/mainChunk.js
@@ -2,13 +2,13 @@ System.register(['./generated-name.js', './generated-secondName.js', './generate
 	'use strict';
 	var value1, value2, value3;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value1 = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			value2 = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			value3 = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main', value1, value2, value3);
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js
index ece485313c4..dbccb2900b9 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js
@@ -2,9 +2,9 @@ System.register(['../generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('startBuild', value);
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js
index 3b45d17d944..39150aad0de 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main', value);
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-emitted2.js
index c4e977c0e26..1f9516f0cef 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-emitted2.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-emitted2.js
@@ -1,9 +1,9 @@
 System.register(['./generated-emitted.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('id', module.i);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/main.js
index 213039c99fc..35e03114fd9 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/main.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./generated-emitted.js'], (function () {
 	'use strict';
 	var id, value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			id = module.i;
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(id);
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-emitted2.js
index c4e977c0e26..1f9516f0cef 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-emitted2.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-emitted2.js
@@ -1,9 +1,9 @@
 System.register(['./generated-emitted.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('id', module.i);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/main.js
index 213039c99fc..35e03114fd9 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/main.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./generated-emitted.js'], (function () {
 	'use strict';
 	var id, value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			id = module.i;
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(id);
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js
index 0b26fa430d8..c73a318e3e4 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js
@@ -2,9 +2,9 @@ System.register(['./shared.js'], (function () {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			postMessage(`from worker: ${shared}`);
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js
index 0e46f9364ed..cd37abb081f 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./chunks/shared.js'], (function (exports, module) {
   'use strict';
   var shared;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       shared = module.s;
-    })],
+    }],
     execute: (function () {
 
       const getWorkerMessage = () => new Promise(resolve => {
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js
index b140a542215..88e721d4520 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js
@@ -2,10 +2,10 @@ System.register(['./shared.js'], (function () {
 	'use strict';
 	var size, color;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			size = module.s;
 			color = module.c;
-		})],
+		}],
 		execute: (function () {
 
 			registerPaint(
diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js
index 9b39699f084..69c57ed6000 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./chunks/shared.js'], (function (exports, module) {
 	'use strict';
 	var color, size;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			color = module.c;
 			size = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			CSS.paintWorklet.addModule(new URL('chunks/worklet.js', module.meta.url).href);
diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js
index 87bb9d21341..12a2c642f50 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('startBuild', value);
diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js
index 3b45d17d944..39150aad0de 100644
--- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js
+++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main', value);
diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/first-main.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/first-main.js
index bf683f62ee9..1901ed04d73 100644
--- a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/first-main.js
+++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/first-main.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main1', value);
diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/second-main.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/second-main.js
index bf683f62ee9..1901ed04d73 100644
--- a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/second-main.js
+++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/second-main.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main1', value);
diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name1.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name1.js
index fc392f08457..a0867b359ea 100644
--- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name1.js
+++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name1.js
@@ -1,9 +1,9 @@
 System.register(['./mainChunk.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('value', module.value);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name2.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name2.js
index fc392f08457..a0867b359ea 100644
--- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name2.js
+++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name2.js
@@ -1,9 +1,9 @@
 System.register(['./mainChunk.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('value', module.value);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/mainChunkFacade.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/mainChunkFacade.js
index fc392f08457..a0867b359ea 100644
--- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/mainChunkFacade.js
+++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/mainChunkFacade.js
@@ -1,9 +1,9 @@
 System.register(['./mainChunk.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('value', module.value);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js
index fc181c7299a..f678780b7ba 100644
--- a/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js
+++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js
@@ -2,9 +2,9 @@ System.register(['../main.js'], (function (exports, module) {
 	'use strict';
 	var showImage;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			showImage = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			var logo = new URL('../assets/logo2-6d5979e4.svg', module.meta.url).href;
diff --git a/test/chunking-form/samples/entry-aliases/_expected/system/main1-alias.js b/test/chunking-form/samples/entry-aliases/_expected/system/main1-alias.js
index 6a676d59785..e6e2eb02d15 100644
--- a/test/chunking-form/samples/entry-aliases/_expected/system/main1-alias.js
+++ b/test/chunking-form/samples/entry-aliases/_expected/system/main1-alias.js
@@ -1,9 +1,9 @@
 System.register(['./generated-dep.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('name', module.n);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/entry-aliases/_expected/system/main1.js b/test/chunking-form/samples/entry-aliases/_expected/system/main1.js
index 6a676d59785..e6e2eb02d15 100644
--- a/test/chunking-form/samples/entry-aliases/_expected/system/main1.js
+++ b/test/chunking-form/samples/entry-aliases/_expected/system/main1.js
@@ -1,9 +1,9 @@
 System.register(['./generated-dep.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('name', module.n);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/entry-aliases/_expected/system/main2.js b/test/chunking-form/samples/entry-aliases/_expected/system/main2.js
index 83047aac195..1505b5c3e52 100644
--- a/test/chunking-form/samples/entry-aliases/_expected/system/main2.js
+++ b/test/chunking-form/samples/entry-aliases/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var name;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			name = module.n;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(name);
diff --git a/test/chunking-form/samples/entry-chunk-export-mode/_expected/system/main1.js b/test/chunking-form/samples/entry-chunk-export-mode/_expected/system/main1.js
index 5c03956d819..5f298efa74b 100644
--- a/test/chunking-form/samples/entry-chunk-export-mode/_expected/system/main1.js
+++ b/test/chunking-form/samples/entry-chunk-export-mode/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./main2.js'], (function () {
 	'use strict';
 	var fn;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			fn = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			fn();
diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-m1.js
index b848042d6b5..c13f54740e9 100644
--- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-m1.js
+++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-m1.js
@@ -2,9 +2,9 @@ System.register(['./m2.js'], (function (exports) {
 	'use strict';
 	var m2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			m2 = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			var ms = /*#__PURE__*/Object.freeze({
diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js
index db8074081a4..9392db5c4b2 100644
--- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js
+++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js
@@ -1,9 +1,9 @@
 System.register(['./m2.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('m2', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js
index eb4a9d48bfc..e3373c17206 100644
--- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js
+++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./generated-m1.js', './m2.js'], (function () {
 	'use strict';
 	var ms;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			ms = module.m;
-		}), function () {}],
+		}, function () {}],
 		execute: (function () {
 
 			console.log(ms);
diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js
index e57ebbf9e63..413fc99fd3e 100644
--- a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js
+++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js
@@ -2,10 +2,10 @@ System.register(['./generated-main2.js'], (function () {
 	'use strict';
 	var log, dep;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			log = module.l;
 			dep = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			log(dep);
diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js
index 88222146a94..337ff510c7b 100644
--- a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js
+++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main2.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module.l);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js b/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js
index e57ebbf9e63..413fc99fd3e 100644
--- a/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js
+++ b/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js
@@ -2,10 +2,10 @@ System.register(['./generated-main2.js'], (function () {
 	'use strict';
 	var log, dep;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			log = module.l;
 			dep = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			log(dep);
diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js b/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js
index 88222146a94..337ff510c7b 100644
--- a/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js
+++ b/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main2.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module.l);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/export-default-from-entry/_expected/system/main.js b/test/chunking-form/samples/export-default-from-entry/_expected/system/main.js
index 9777aa3ff43..5f26b40b323 100644
--- a/test/chunking-form/samples/export-default-from-entry/_expected/system/main.js
+++ b/test/chunking-form/samples/export-default-from-entry/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register(['./dep.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('value', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/external-imports/_expected/system/main-default.js b/test/chunking-form/samples/external-imports/_expected/system/main-default.js
index ecc76069381..bce693edd18 100644
--- a/test/chunking-form/samples/external-imports/_expected/system/main-default.js
+++ b/test/chunking-form/samples/external-imports/_expected/system/main-default.js
@@ -2,15 +2,15 @@ System.register(['external-all', 'external-default', 'external-default-named', '
 	'use strict';
 	var foo__default, bar, baz, quux__default;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo__default = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			bar = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			baz = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			quux__default = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo__default, bar, baz, quux__default);
diff --git a/test/chunking-form/samples/external-imports/_expected/system/main-named.js b/test/chunking-form/samples/external-imports/_expected/system/main-named.js
index ba6c966dc2e..d5deb31fb50 100644
--- a/test/chunking-form/samples/external-imports/_expected/system/main-named.js
+++ b/test/chunking-form/samples/external-imports/_expected/system/main-named.js
@@ -2,15 +2,15 @@ System.register(['external-all', 'external-named', 'external-default-named', 'ex
 	'use strict';
 	var foo, bar, baz, quux;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.foo;
-		}), (function (module) {
+		}, function (module) {
 			bar = module.bar;
-		}), (function (module) {
+		}, function (module) {
 			baz = module.baz;
-		}), (function (module) {
+		}, function (module) {
 			quux = module.quux;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, bar, baz, quux);
diff --git a/test/chunking-form/samples/external-imports/_expected/system/main-namespace.js b/test/chunking-form/samples/external-imports/_expected/system/main-namespace.js
index 129cd15d705..7386dc73fe5 100644
--- a/test/chunking-form/samples/external-imports/_expected/system/main-namespace.js
+++ b/test/chunking-form/samples/external-imports/_expected/system/main-namespace.js
@@ -2,15 +2,15 @@ System.register(['external-all', 'external-namespace', 'external-default-namespa
 	'use strict';
 	var foo, bar, quux, quux$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module;
-		}), (function (module) {
+		}, function (module) {
 			bar = module;
-		}), (function (module) {
+		}, function (module) {
 			quux = module;
-		}), (function (module) {
+		}, function (module) {
 			quux$1 = module;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, bar, quux, quux$1);
diff --git a/test/chunking-form/samples/external-reexports/_expected/system/main-default.js b/test/chunking-form/samples/external-reexports/_expected/system/main-default.js
index 0b3fc907097..63648f8467a 100644
--- a/test/chunking-form/samples/external-reexports/_expected/system/main-default.js
+++ b/test/chunking-form/samples/external-reexports/_expected/system/main-default.js
@@ -1,15 +1,15 @@
 System.register(['external-all', 'external-default', 'external-default-named', 'external-default-namespace'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('foo', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('bar', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('baz', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('quux', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/external-reexports/_expected/system/main-named.js b/test/chunking-form/samples/external-reexports/_expected/system/main-named.js
index baa64628809..bd9a89eed83 100644
--- a/test/chunking-form/samples/external-reexports/_expected/system/main-named.js
+++ b/test/chunking-form/samples/external-reexports/_expected/system/main-named.js
@@ -1,15 +1,15 @@
 System.register(['external-all', 'external-named', 'external-default-named', 'external-named-namespace'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('foo', module.foo);
-		}), (function (module) {
+		}, function (module) {
 			exports('bar', module.bar);
-		}), (function (module) {
+		}, function (module) {
 			exports('baz', module.baz);
-		}), (function (module) {
+		}, function (module) {
 			exports('quux', module.quux);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/external-reexports/_expected/system/main-namespace.js b/test/chunking-form/samples/external-reexports/_expected/system/main-namespace.js
index 36f543a1f4e..2b8037ae8b8 100644
--- a/test/chunking-form/samples/external-reexports/_expected/system/main-namespace.js
+++ b/test/chunking-form/samples/external-reexports/_expected/system/main-namespace.js
@@ -1,15 +1,15 @@
 System.register(['external-all', 'external-namespace', 'external-default-namespace', 'external-named-namespace'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('foo', module);
-		}), (function (module) {
+		}, function (module) {
 			exports('bar', module);
-		}), (function (module) {
+		}, function (module) {
 			exports('baz', module);
-		}), (function (module) {
+		}, function (module) {
 			exports('quux', module);
-		})],
+		}],
 		execute: (function () {
 
 			const externalNamespace = 1;
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-e6585a3e-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-e6585a3e-system.js
index 8bb73d02d46..62b088bf16f 100644
--- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-e6585a3e-system.js
+++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-e6585a3e-system.js
@@ -2,10 +2,10 @@ System.register(['./chunk-main2-97f5caac-system.js'], (function () {
 	'use strict';
 	var log, dep;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			log = module.l;
 			dep = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			log(dep);
diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-2e964c97-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-2e964c97-system.js
index a02b49d3702..0f325c8f3d3 100644
--- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-2e964c97-system.js
+++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-2e964c97-system.js
@@ -1,9 +1,9 @@
 System.register(['./chunk-main2-97f5caac-system.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module.l);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/generated-code/arrow-functions-false/_expected/system/main.js b/test/chunking-form/samples/generated-code/arrow-functions-false/_expected/system/main.js
index f774646ac59..0d25b49f41d 100644
--- a/test/chunking-form/samples/generated-code/arrow-functions-false/_expected/system/main.js
+++ b/test/chunking-form/samples/generated-code/arrow-functions-false/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./generated-dep1.js'], (function () {
 	'use strict';
 	var foo, bar;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.f;
 			bar = module.b;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, bar);
diff --git a/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/amd/generated-dep1.js b/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/amd/generated-dep1.js
index 78dc9fa50f1..df06ecfa8a6 100644
--- a/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/amd/generated-dep1.js
+++ b/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/amd/generated-dep1.js
@@ -1,4 +1,4 @@
-define(['exports'], (exports => { 'use strict';
+define(['exports'], (function (exports) { 'use strict';
 
 	const foo = 'dep2';
 	Promise.resolve().then(() => dep1).then(console.log);
diff --git a/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/amd/main.js b/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/amd/main.js
index f438f4bd205..020c82b8402 100644
--- a/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/amd/main.js
+++ b/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/amd/main.js
@@ -1,4 +1,4 @@
-define(['./generated-dep1'], (dep1 => { 'use strict';
+define(['./generated-dep1'], (function (dep1) { 'use strict';
 
 	console.log(dep1.foo, dep1.bar);
 
diff --git a/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/amd/main2.js b/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/amd/main2.js
index 10dfaa6a92b..8d1097019eb 100644
--- a/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/amd/main2.js
+++ b/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/amd/main2.js
@@ -1,4 +1,4 @@
-define(['require'], (require => { 'use strict';
+define(['require'], (function (require) { 'use strict';
 
 	new Promise((resolve, reject) => require(['./generated-dep1'], resolve, reject)).then(n => n.dep1).then(console.log);
 
diff --git a/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/system/generated-dep1.js b/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/system/generated-dep1.js
index 021a586ecc6..b51a6c39477 100644
--- a/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/system/generated-dep1.js
+++ b/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/system/generated-dep1.js
@@ -1,7 +1,7 @@
-System.register([], (exports => {
+System.register([], (function (exports) {
 	'use strict';
 	return {
-		execute: (() => {
+		execute: (function () {
 
 			const foo = exports('f', 'dep2');
 			Promise.resolve().then(() => dep1).then(console.log);
diff --git a/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/system/main.js b/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/system/main.js
index 4890987ad31..e3ababbe349 100644
--- a/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/system/main.js
+++ b/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/system/main.js
@@ -1,12 +1,12 @@
-System.register(['./generated-dep1.js'], (() => {
+System.register(['./generated-dep1.js'], (function () {
 	'use strict';
 	var foo, bar;
 	return {
-		setters: [(module => {
+		setters: [module => {
 			foo = module.f;
 			bar = module.b;
-		})],
-		execute: (() => {
+		}],
+		execute: (function () {
 
 			console.log(foo, bar);
 
diff --git a/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/system/main2.js b/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/system/main2.js
index 741d3c8a9ee..bfe7a6c93ed 100644
--- a/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/system/main2.js
+++ b/test/chunking-form/samples/generated-code/arrow-functions-true/_expected/system/main2.js
@@ -1,7 +1,7 @@
-System.register([], ((exports, module) => {
+System.register([], (function (exports, module) {
 	'use strict';
 	return {
-		execute: (() => {
+		execute: (function () {
 
 			module.import('./generated-dep1.js').then(n => n.d).then(console.log);
 
diff --git a/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/system/main.js b/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/system/main.js
index a0234cd1977..1c338e63851 100644
--- a/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/system/main.js
+++ b/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register('bundle', ['./main2.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('foo', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/system/main.js b/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/system/main.js
index 74eb62e77d1..8e3f42c369c 100644
--- a/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/system/main.js
+++ b/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register('bundle', ['./main2.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('foo', module.default);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_expected/system/generated-dep.js b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_expected/system/generated-dep.js
index 3fe1b654681..42acb18c54c 100644
--- a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_expected/system/generated-dep.js
+++ b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_expected/system/generated-dep.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(value);
diff --git a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_expected/system/main.js b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_expected/system/main.js
index 3fe1b654681..42acb18c54c 100644
--- a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_expected/system/main.js
+++ b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(value);
diff --git a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_expected/system/dep.js b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_expected/system/dep.js
index 3fe1b654681..42acb18c54c 100644
--- a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_expected/system/dep.js
+++ b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_expected/system/dep.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(value);
diff --git a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_expected/system/main.js b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_expected/system/main.js
index 3fe1b654681..42acb18c54c 100644
--- a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_expected/system/main.js
+++ b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(value);
diff --git a/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_expected/system/generated-dep.js b/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_expected/system/generated-dep.js
index 97e1d41a235..01adc30a10a 100644
--- a/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_expected/system/generated-dep.js
+++ b/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_expected/system/generated-dep.js
@@ -2,13 +2,13 @@ System.register(['./generated-lib1b.js', './generated-lib2.js', './generated-lib
 	'use strict';
 	var lib1, lib2, lib3;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib1 = module.l;
-		}), (function (module) {
+		}, function (module) {
 			lib2 = module.l;
-		}), (function (module) {
+		}, function (module) {
 			lib3 = module.l;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(lib1, lib2, lib3);
diff --git a/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_expected/system/main1.js b/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_expected/system/main1.js
index 45371b64b5f..12f48ccd77d 100644
--- a/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_expected/system/main1.js
+++ b/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_expected/system/main1.js
@@ -2,12 +2,12 @@ System.register(['./generated-lib1b.js', './generated-lib2.js'], (function () {
 	'use strict';
 	var lib1, lib1b, lib2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib1 = module.l;
 			lib1b = module.a;
-		}), (function (module) {
+		}, function (module) {
 			lib2 = module.l;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main1', lib1,  lib1b, lib2);
diff --git a/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_expected/system/main2.js b/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_expected/system/main2.js
index 65b63d9d227..bb2381df817 100644
--- a/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_expected/system/main2.js
+++ b/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_expected/system/main2.js
@@ -2,12 +2,12 @@ System.register(['./generated-lib1b.js', './generated-lib3.js'], (function () {
 	'use strict';
 	var lib1, lib1b, lib3;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib1 = module.l;
 			lib1b = module.a;
-		}), (function (module) {
+		}, function (module) {
 			lib3 = module.l;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main2', lib1, lib1b, lib3);
diff --git a/test/chunking-form/samples/implicit-dependencies/preserve-signature-allow-extension/_expected/system/generated-dynamicDep.js b/test/chunking-form/samples/implicit-dependencies/preserve-signature-allow-extension/_expected/system/generated-dynamicDep.js
index edc12b16adb..f7e6e21a538 100644
--- a/test/chunking-form/samples/implicit-dependencies/preserve-signature-allow-extension/_expected/system/generated-dynamicDep.js
+++ b/test/chunking-form/samples/implicit-dependencies/preserve-signature-allow-extension/_expected/system/generated-dynamicDep.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(value);
diff --git a/test/chunking-form/samples/implicit-dependencies/preserve-signature-false/_expected/system/generated-dynamicDep.js b/test/chunking-form/samples/implicit-dependencies/preserve-signature-false/_expected/system/generated-dynamicDep.js
index edc12b16adb..f7e6e21a538 100644
--- a/test/chunking-form/samples/implicit-dependencies/preserve-signature-false/_expected/system/generated-dynamicDep.js
+++ b/test/chunking-form/samples/implicit-dependencies/preserve-signature-false/_expected/system/generated-dynamicDep.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(value);
diff --git a/test/chunking-form/samples/implicit-dependencies/preserve-signature-strict/_expected/system/generated-dep2.js b/test/chunking-form/samples/implicit-dependencies/preserve-signature-strict/_expected/system/generated-dep2.js
index 0d19a03cc0a..0f0a4fc2dbc 100644
--- a/test/chunking-form/samples/implicit-dependencies/preserve-signature-strict/_expected/system/generated-dep2.js
+++ b/test/chunking-form/samples/implicit-dependencies/preserve-signature-strict/_expected/system/generated-dep2.js
@@ -1,9 +1,9 @@
 System.register(['./generated-dep.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('dep', module.d);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/implicit-dependencies/preserve-signature-strict/_expected/system/generated-dynamicDep.js b/test/chunking-form/samples/implicit-dependencies/preserve-signature-strict/_expected/system/generated-dynamicDep.js
index edc12b16adb..f7e6e21a538 100644
--- a/test/chunking-form/samples/implicit-dependencies/preserve-signature-strict/_expected/system/generated-dynamicDep.js
+++ b/test/chunking-form/samples/implicit-dependencies/preserve-signature-strict/_expected/system/generated-dynamicDep.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(value);
diff --git a/test/chunking-form/samples/implicit-dependencies/same-chunk-dependency/_expected/system/generated-dep.js b/test/chunking-form/samples/implicit-dependencies/same-chunk-dependency/_expected/system/generated-dep.js
index 9a19b5694c5..071c542871d 100644
--- a/test/chunking-form/samples/implicit-dependencies/same-chunk-dependency/_expected/system/generated-dep.js
+++ b/test/chunking-form/samples/implicit-dependencies/same-chunk-dependency/_expected/system/generated-dep.js
@@ -1,9 +1,9 @@
 System.register(['./generated-lib.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('dep', module.d);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/system/generated-button.js b/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/system/generated-button.js
index 6969e1fd0d9..e7e8095f511 100644
--- a/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/system/generated-button.js
+++ b/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/system/generated-button.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function (exports) {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.foo;
-		})],
+		}],
 		execute: (function () {
 
 			const bar = exports('bar', foo + 'bar');
diff --git a/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/system/generated-core.js b/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/system/generated-core.js
index 0c19e3c83cf..6a91a27fadd 100644
--- a/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/system/generated-core.js
+++ b/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/system/generated-core.js
@@ -1,9 +1,9 @@
 System.register(['./main.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('foo', module.foo);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/system/generated-implicit.js b/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/system/generated-implicit.js
index 0c19e3c83cf..6a91a27fadd 100644
--- a/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/system/generated-implicit.js
+++ b/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/system/generated-implicit.js
@@ -1,9 +1,9 @@
 System.register(['./main.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('foo', module.foo);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/system/generated-dep.js b/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/system/generated-dep.js
index d353337e83d..5c111e397a1 100644
--- a/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/system/generated-dep.js
+++ b/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/system/generated-dep.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(value);
diff --git a/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk.js b/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk.js
index 9dcc01f77e9..6a31d73cd18 100644
--- a/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk.js
+++ b/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk.js
@@ -2,9 +2,9 @@ System.register(['../main.js'], (function (exports, module) {
 	'use strict';
 	var log;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			log = module.l;
-		})],
+		}],
 		execute: (function () {
 
 			log('nested: ' + module.meta.url);
diff --git a/test/chunking-form/samples/import-variable-duplicates/_expected/system/head.js b/test/chunking-form/samples/import-variable-duplicates/_expected/system/head.js
index 703211f35e7..52bbd18097f 100644
--- a/test/chunking-form/samples/import-variable-duplicates/_expected/system/head.js
+++ b/test/chunking-form/samples/import-variable-duplicates/_expected/system/head.js
@@ -1,9 +1,9 @@
 System.register(['./first.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/import-variable-duplicates/_expected/system/main1.js b/test/chunking-form/samples/import-variable-duplicates/_expected/system/main1.js
index dc0f9b999a0..09eae940f42 100644
--- a/test/chunking-form/samples/import-variable-duplicates/_expected/system/main1.js
+++ b/test/chunking-form/samples/import-variable-duplicates/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./first.js'], (function () {
 	'use strict';
 	var head2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			head2 = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log(head2);
diff --git a/test/chunking-form/samples/import-variable-duplicates/_expected/system/main2.js b/test/chunking-form/samples/import-variable-duplicates/_expected/system/main2.js
index dc0f9b999a0..09eae940f42 100644
--- a/test/chunking-form/samples/import-variable-duplicates/_expected/system/main2.js
+++ b/test/chunking-form/samples/import-variable-duplicates/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./first.js'], (function () {
 	'use strict';
 	var head2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			head2 = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log(head2);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-dynamic2.js
index fd410ba1048..5fdc607df00 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-dynamic2.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-dynamic2.js
@@ -1,9 +1,9 @@
 System.register(['./main.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('shared', module.shared);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js
index 2fcfba04175..7d4687f325d 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js
@@ -2,10 +2,10 @@ System.register(['./main.js'], (function (exports) {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.value;
 			exports('value', module.value);
-		})],
+		}],
 		execute: (function () {
 
 			console.log('dynamic2', value);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js
index a7b2dce891f..225fc02ed2d 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js
@@ -2,10 +2,10 @@ System.register(['./generated-dynamic1.js'], (function (exports) {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.value;
 			exports('value', module.value);
-		})],
+		}],
 		execute: (function () {
 
 			console.log('dynamic2', value);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-dynamic.js
index bccc7c82cc7..d28a89fd88f 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-dynamic.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var value1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value1 = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('dynamic', value1);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-shared.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-shared.js
index 33cd6099b4f..51cb622d8e1 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-shared.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-shared.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function (exports, module) {
 	'use strict';
 	var value1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value1 = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			module.import('./generated-dynamic.js');
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js
index a76dba07bab..45a4caf0bd6 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js
@@ -2,13 +2,13 @@ System.register(['./generated-from-main-1-and-dynamic.js', './generated-from-mai
 	'use strict';
 	var value1, value2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value1 = module.v;
 			exports('value1', module.v);
-		}), (function (module) {
+		}, function (module) {
 			value2 = module.v;
 			exports('value2', module.v);
-		})],
+		}],
 		execute: (function () {
 
 			console.log('dynamic1', value1, value2);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js
index 288cfff427a..6eb53c1569f 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js
@@ -2,14 +2,14 @@ System.register(['./generated-from-main-1-and-dynamic.js', './generated-from-mai
 	'use strict';
 	var value1, value2, value3;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value1 = module.v;
 			exports('value1', module.v);
-		}), (function (module) {
+		}, function (module) {
 			value2 = module.v;
 			value3 = module.a;
 			exports({ value2: module.v, value3: module.a });
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main1', value1, value2, value3);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js
index ab415f6f304..a899ec2add7 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js
@@ -2,11 +2,11 @@ System.register(['./generated-from-main-1-and-2.js'], (function (exports, module
 	'use strict';
 	var value2, value3;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value2 = module.v;
 			value3 = module.a;
 			exports({ value2: module.v, value3: module.a });
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main2', value2, value3);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js
index 8b0d2504261..fbd6441c933 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js
@@ -2,13 +2,13 @@ System.register(['./generated-dep1.js', './generated-dep2.js'], (function (expor
 	'use strict';
 	var value1, value2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value1 = module.v;
 			exports('value1', module.v);
-		}), (function (module) {
+		}, function (module) {
 			value2 = module.v;
 			exports('value2', module.v);
-		})],
+		}],
 		execute: (function () {
 
 			console.log('dynamic1', value1, value2);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js
index c23c44fc97a..5b5005ed520 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js
@@ -2,13 +2,13 @@ System.register(['./generated-dep1.js', './generated-dep2.js'], (function (expor
 	'use strict';
 	var value1, value2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value1 = module.v;
 			exports('value1', module.v);
-		}), (function (module) {
+		}, function (module) {
 			value2 = module.v;
 			exports('value2', module.v);
-		})],
+		}],
 		execute: (function () {
 
 			const something = 'something';
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js
index 3db34a8db3e..29e0858ad56 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js
@@ -2,10 +2,10 @@ System.register(['./generated-dep2.js'], (function (exports, module) {
 	'use strict';
 	var value2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value2 = module.v;
 			exports('value2', module.v);
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main2', value2);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js
index 4faf2d0274c..d7a24ba141b 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js
@@ -2,10 +2,10 @@ System.register(['./main1.js', './generated-dep2.js'], (function (exports) {
 	'use strict';
 	var value1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value1 = module.value1;
 			exports('value1', module.value1);
-		}), function () {}],
+		}, function () {}],
 		execute: (function () {
 
 			console.log('dynamic1', value1);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js
index ee9ff7d6386..54cbe03b301 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js
@@ -2,10 +2,10 @@ System.register(['./generated-dep2.js'], (function (exports) {
 	'use strict';
 	var value2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value2 = module.v;
 			exports('value2', module.v);
-		})],
+		}],
 		execute: (function () {
 
 			console.log('dynamic2', value2);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js
index de9a832bf0f..38539f063a3 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js
@@ -2,10 +2,10 @@ System.register(['./generated-dep2.js'], (function (exports, module) {
 	'use strict';
 	var value2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value2 = module.v;
 			exports('value2', module.v);
-		})],
+		}],
 		execute: (function () {
 
 			const value1 = exports('value1', 'shared1');
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js
index 380cd3aa106..0ea4b3cd7ca 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js
@@ -2,10 +2,10 @@ System.register(['./generated-dep2.js'], (function (exports, module) {
 	'use strict';
 	var value2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value2 = module.v;
 			exports('value2', module.v);
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main2', value2);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/generated-dynamic.js
index c1ff255e9e3..53e95abfe53 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/generated-dynamic.js
@@ -2,9 +2,9 @@ System.register(['./generated-shared.js'], (function () {
 	'use strict';
 	var value1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value1 = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('dynamic', value1);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js
index df8081001e0..0a561be362c 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js
@@ -2,10 +2,10 @@ System.register(['./main.js'], (function (exports) {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.value;
 			exports('value', module.value);
-		})],
+		}],
 		execute: (function () {
 
 			console.log('dynamic', value);
diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js
index df8081001e0..0a561be362c 100644
--- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js
@@ -2,10 +2,10 @@ System.register(['./main.js'], (function (exports) {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.value;
 			exports('value', module.value);
-		})],
+		}],
 		execute: (function () {
 
 			console.log('dynamic', value);
diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/components/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/components/index.js
index 3caf276d071..d4a4217d31a 100644
--- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/components/index.js
+++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/components/index.js
@@ -2,10 +2,10 @@ System.register('bundle', ['./sub/index.js'], (function (exports) {
 	'use strict';
 	var bar;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			bar = module["default"];
 			exports('foo', module.foo);
-		})],
+		}],
 		execute: (function () {
 
 			const baz = exports('baz', { bar });
diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/main.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/main.js
index e7b6198bc5b..26be107a7a2 100644
--- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/main.js
+++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/main.js
@@ -1,11 +1,11 @@
 System.register('bundle', ['./components/index.js', './components/sub/index.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('baz', module.baz);
-		}), (function (module) {
+		}, function (module) {
 			exports('foo', module.foo);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/auto.js b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/auto.js
index 5f2ebb213ac..7a269d04818 100644
--- a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/auto.js
+++ b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/auto.js
@@ -1,9 +1,9 @@
 System.register(['external-auto'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/default.js b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/default.js
index 39abd7ef5da..9f933cd5606 100644
--- a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/default.js
+++ b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/default.js
@@ -1,9 +1,9 @@
 System.register(['external-default'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/defaultOnly.js b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/defaultOnly.js
index 39abd7ef5da..9f933cd5606 100644
--- a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/defaultOnly.js
+++ b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/defaultOnly.js
@@ -1,9 +1,9 @@
 System.register(['external-default'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/esModule.js b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/esModule.js
index 45f8d1e4a0b..feb418dc6ec 100644
--- a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/esModule.js
+++ b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/esModule.js
@@ -1,9 +1,9 @@
 System.register(['external-esModule'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/main1.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/main1.js
index cb4535ebd5b..f189fb530a6 100644
--- a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/main1.js
+++ b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./main2.js'], (function () {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.reexported;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main', value);
diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/main.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/main.js
index 729939ec7a8..f8bb41b07d8 100644
--- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/main.js
+++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./generated-dynamic.js'], (function (exports, module) {
 	'use strict';
 	var DEP;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			DEP = module.D;
-		})],
+		}],
 		execute: (function () {
 
 			Promise.all([module.import('./generated-dynamic.js').then(function (n) { return n.b; }), module.import('./generated-dynamic.js').then(function (n) { return n.d; }), module.import('./generated-dynamic.js').then(function (n) { return n.a; })]).then(
diff --git a/test/chunking-form/samples/manual-chunks/_expected/system/generated-deps2and3.js b/test/chunking-form/samples/manual-chunks/_expected/system/generated-deps2and3.js
index c48d3573ee8..a0867bcd984 100644
--- a/test/chunking-form/samples/manual-chunks/_expected/system/generated-deps2and3.js
+++ b/test/chunking-form/samples/manual-chunks/_expected/system/generated-deps2and3.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib1.js'], (function (exports) {
   'use strict';
   var fn$3;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$3 = module.f;
-    })],
+    }],
     execute: (function () {
 
       exports({
diff --git a/test/chunking-form/samples/manual-chunks/_expected/system/main.js b/test/chunking-form/samples/manual-chunks/_expected/system/main.js
index e8f88731c60..a1339e81333 100644
--- a/test/chunking-form/samples/manual-chunks/_expected/system/main.js
+++ b/test/chunking-form/samples/manual-chunks/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./generated-deps2and3.js', './generated-lib1.js'], (function (
   'use strict';
   var fn$1, fn$2;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$1 = module.f;
       fn$2 = module.a;
-    }), function () {}],
+    }, function () {}],
     execute: (function () {
 
       function fn () {
diff --git a/test/chunking-form/samples/minify-internal-exports/_expected/system/main1.js b/test/chunking-form/samples/minify-internal-exports/_expected/system/main1.js
index bea97548fa9..061c6d5b85c 100644
--- a/test/chunking-form/samples/minify-internal-exports/_expected/system/main1.js
+++ b/test/chunking-form/samples/minify-internal-exports/_expected/system/main1.js
@@ -2,11 +2,11 @@ System.register(['./generated-shared2.js'], (function () {
 	'use strict';
 	var shared1, shared2, foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared1 = module.s;
 			shared2 = module.a;
 			foo = module.f;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(shared1, shared2, foo);
diff --git a/test/chunking-form/samples/minify-internal-exports/_expected/system/main2.js b/test/chunking-form/samples/minify-internal-exports/_expected/system/main2.js
index 731ce07a852..d9b017a884e 100644
--- a/test/chunking-form/samples/minify-internal-exports/_expected/system/main2.js
+++ b/test/chunking-form/samples/minify-internal-exports/_expected/system/main2.js
@@ -2,11 +2,11 @@ System.register(['./generated-shared2.js'], (function () {
 	'use strict';
 	var shared1, shared2, foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared1 = module.s;
 			shared2 = module.a;
 			foo = module.b;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(shared1, shared2, foo);
diff --git a/test/chunking-form/samples/missing-export-compact/_expected/system/main.js b/test/chunking-form/samples/missing-export-compact/_expected/system/main.js
index ffb853e4e37..624d038328c 100644
--- a/test/chunking-form/samples/missing-export-compact/_expected/system/main.js
+++ b/test/chunking-form/samples/missing-export-compact/_expected/system/main.js
@@ -1,2 +1,2 @@
-System.register(['./dep.js'],(function(){'use strict';var _missingExportShim,x;return{setters:[(function(module){_missingExportShim=module.missingFn;x=module.x;})],execute:(function(){_missingExportShim();
+System.register(['./dep.js'],(function(){'use strict';var _missingExportShim,x;return{setters:[function(module){_missingExportShim=module.missingFn;x=module.x;}],execute:(function(){_missingExportShim();
 x(_missingExportShim);})}}));
\ No newline at end of file
diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/system/main.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/system/main.js
index 34d0c182252..85562809d93 100644
--- a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/system/main.js
+++ b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/system/main.js
@@ -2,12 +2,12 @@ System.register(['./dep1.js', './dep2.js'], (function () {
 	'use strict';
 	var _missingExportShim, _missingExportShim$1, _missingExportShim$2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			_missingExportShim = module.missing1;
-		}), (function (module) {
+		}, function (module) {
 			_missingExportShim$1 = module.missing2;
 			_missingExportShim$2 = module.previousShimmedExport;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(_missingExportShim, _missingExportShim$1, _missingExportShim$2);
diff --git a/test/chunking-form/samples/missing-export/_expected/system/main.js b/test/chunking-form/samples/missing-export/_expected/system/main.js
index f47699ea4ec..f8539e604cc 100644
--- a/test/chunking-form/samples/missing-export/_expected/system/main.js
+++ b/test/chunking-form/samples/missing-export/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./dep.js'], (function () {
 	'use strict';
 	var _missingExportShim, x;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			_missingExportShim = module.missingFn;
 			x = module.x;
-		})],
+		}],
 		execute: (function () {
 
 			_missingExportShim();
diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/main1.js b/test/chunking-form/samples/multi-chunking/_expected/system/main1.js
index dc563da50b6..d6c446c9440 100644
--- a/test/chunking-form/samples/multi-chunking/_expected/system/main1.js
+++ b/test/chunking-form/samples/multi-chunking/_expected/system/main1.js
@@ -2,11 +2,11 @@ System.register(['./generated-dep1.js', './generated-dep2.js'], (function () {
 	'use strict';
 	var num, num$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			num = module.n;
-		}), (function (module) {
+		}, function (module) {
 			num$1 = module.n;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(num + num$1);
diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/main2.js b/test/chunking-form/samples/multi-chunking/_expected/system/main2.js
index a2d44909995..a7c20f30e94 100644
--- a/test/chunking-form/samples/multi-chunking/_expected/system/main2.js
+++ b/test/chunking-form/samples/multi-chunking/_expected/system/main2.js
@@ -2,11 +2,11 @@ System.register(['./generated-dep2.js', './generated-dep3.js'], (function () {
 	'use strict';
 	var num, num$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			num = module.n;
-		}), (function (module) {
+		}, function (module) {
 			num$1 = module.n;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(num + num$1);
diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/main3.js b/test/chunking-form/samples/multi-chunking/_expected/system/main3.js
index 68492d1015f..b0866a7c086 100644
--- a/test/chunking-form/samples/multi-chunking/_expected/system/main3.js
+++ b/test/chunking-form/samples/multi-chunking/_expected/system/main3.js
@@ -2,11 +2,11 @@ System.register(['./generated-dep1.js', './generated-dep3.js'], (function () {
 	'use strict';
 	var num, num$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			num = module.n;
-		}), (function (module) {
+		}, function (module) {
 			num$1 = module.n;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(num + num$1);
diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/system/main.js b/test/chunking-form/samples/multiple-entry-points/_expected/system/main.js
index 11f5718b686..baf838e3bfc 100644
--- a/test/chunking-form/samples/multiple-entry-points/_expected/system/main.js
+++ b/test/chunking-form/samples/multiple-entry-points/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./chunks/shared.js'], (function () {
 	'use strict';
 	var sharedValue;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			sharedValue = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			assert.equal(sharedValue, 'shared');
diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/system/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/system/other.js
index df51274079c..cc804b0fa44 100644
--- a/test/chunking-form/samples/multiple-entry-points/_expected/system/other.js
+++ b/test/chunking-form/samples/multiple-entry-points/_expected/system/other.js
@@ -1,9 +1,9 @@
 System.register(['./chunks/shared.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('sharedValue', module.s);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/namespace-imports-from-chunks/_expected/system/main2.js b/test/chunking-form/samples/namespace-imports-from-chunks/_expected/system/main2.js
index 34e24ed646b..388e8eea74a 100644
--- a/test/chunking-form/samples/namespace-imports-from-chunks/_expected/system/main2.js
+++ b/test/chunking-form/samples/namespace-imports-from-chunks/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./main1.js'], (function () {
 	'use strict';
 	var p;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			p = module.p;
-		})],
+		}],
 		execute: (function () {
 
 			console.log( p );
diff --git a/test/chunking-form/samples/namespace-object-import/_expected/system/main1.js b/test/chunking-form/samples/namespace-object-import/_expected/system/main1.js
index fb49824e834..3cd0aeaf331 100644
--- a/test/chunking-form/samples/namespace-object-import/_expected/system/main1.js
+++ b/test/chunking-form/samples/namespace-object-import/_expected/system/main1.js
@@ -2,10 +2,10 @@ System.register(['./generated-main2.js'], (function () {
 	'use strict';
 	var a, main2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			a = module.a;
 			main2 = module.m;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(a);
diff --git a/test/chunking-form/samples/namespace-object-import/_expected/system/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/system/main2.js
index d4095f15285..2c07104fef3 100644
--- a/test/chunking-form/samples/namespace-object-import/_expected/system/main2.js
+++ b/test/chunking-form/samples/namespace-object-import/_expected/system/main2.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main2.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports({ a: module.a, b: module.b });
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-index.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-index.js
index b555506c591..4da41e0b3de 100644
--- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-index.js
+++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-index.js
@@ -2,11 +2,11 @@ System.register(['./generated-dep.js', 'external'], (function (exports) {
 	'use strict';
 	var reexported$1, reexported;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			reexported$1 = module.r;
-		}), (function (module) {
+		}, function (module) {
 			reexported = module.reexported;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(reexported);
diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js
index 6699c5211c9..5552fa131ff 100644
--- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js
+++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-index.js', './generated-dep.js', 'external'], (fun
 	'use strict';
 	var lib;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib = module.l;
-		}), function () {}, function () {}],
+		}, function () {}, function () {}],
 		execute: (function () {
 
 			console.log(lib);
diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js
index a3c4b9b3004..9692e651fe8 100644
--- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js
+++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-index.js', './generated-dep.js', 'external'], (fun
 	'use strict';
 	var reexported;
 	return {
-		setters: [function () {}, (function (module) {
+		setters: [function () {}, function (module) {
 			reexported = module.r;
-		}), function () {}],
+		}, function () {}],
 		execute: (function () {
 
 			console.log(reexported);
diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main3.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main3.js
index 86a0828bfda..bd67c0ead1d 100644
--- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main3.js
+++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main3.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var reexported;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			reexported = module.r;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(reexported);
diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js b/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js
index 04fcbe316eb..cb0a9853c7b 100644
--- a/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js
+++ b/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js
@@ -2,9 +2,9 @@ System.register(['./hsl2hsv.js'], (function (exports) {
 	'use strict';
 	var hsl2hsv$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			hsl2hsv$1 = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			var hsl2hsv = 'asdf';
diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/index.js b/test/chunking-form/samples/namespace-reexports/_expected/system/index.js
index 6eff2e770a6..0afb42920bf 100644
--- a/test/chunking-form/samples/namespace-reexports/_expected/system/index.js
+++ b/test/chunking-form/samples/namespace-reexports/_expected/system/index.js
@@ -1,9 +1,9 @@
 System.register(['./hsl2hsv.js', './generated-index.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('hsl2hsv', module["default"]);
-		}), function () {}],
+		}, function () {}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/main.js b/test/chunking-form/samples/namespace-reexports/_expected/system/main.js
index a960588e4bc..98a081039aa 100644
--- a/test/chunking-form/samples/namespace-reexports/_expected/system/main.js
+++ b/test/chunking-form/samples/namespace-reexports/_expected/system/main.js
@@ -2,11 +2,11 @@ System.register(['./generated-index.js', './hsl2hsv.js'], (function (exports) {
 	'use strict';
 	var lib, p;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib = module.l;
-		}), (function (module) {
+		}, function (module) {
 			p = module.p;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(p);
diff --git a/test/chunking-form/samples/namespace-retracing/_expected/system/main-a.js b/test/chunking-form/samples/namespace-retracing/_expected/system/main-a.js
index 92d4ad90219..4d968d27bc0 100644
--- a/test/chunking-form/samples/namespace-retracing/_expected/system/main-a.js
+++ b/test/chunking-form/samples/namespace-retracing/_expected/system/main-a.js
@@ -2,10 +2,10 @@ System.register(['./generated-other.js'], (function () {
 	'use strict';
 	var Other, Broken;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			Other = module.O;
 			Broken = module.B;
-		})],
+		}],
 		execute: (function () {
 
 			Other.doSomething();
diff --git a/test/chunking-form/samples/namespace-retracing/_expected/system/main-b.js b/test/chunking-form/samples/namespace-retracing/_expected/system/main-b.js
index 1f98ef4933a..7c5f355d4f2 100644
--- a/test/chunking-form/samples/namespace-retracing/_expected/system/main-b.js
+++ b/test/chunking-form/samples/namespace-retracing/_expected/system/main-b.js
@@ -2,9 +2,9 @@ System.register(['./generated-other.js'], (function () {
 	'use strict';
 	var Other;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			Other = module.O;
-		})],
+		}],
 		execute: (function () {
 
 			Other.doSomething();
diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js
index 195e113ddd4..3f40251129e 100644
--- a/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js
+++ b/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js
@@ -2,11 +2,11 @@ System.register(['./generated-foo.js', './generated-broken.js'], (function () {
 	'use strict';
 	var foo, broken;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.f;
-		}), (function (module) {
+		}, function (module) {
 			broken = module.b;
-		})],
+		}],
 		execute: (function () {
 
 			foo();
diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js
index 77244235bdd..4742de3c8b2 100644
--- a/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js
+++ b/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js
@@ -2,13 +2,13 @@ System.register(['./generated-foo.js', './generated-bar.js', './generated-broken
 	'use strict';
 	var foo, bar, broken;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.f;
-		}), (function (module) {
+		}, function (module) {
 			bar = module.b;
-		}), (function (module) {
+		}, function (module) {
 			broken = module.b;
-		})],
+		}],
 		execute: (function () {
 
 			foo();
diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js
index 76369b281ed..6f413253175 100644
--- a/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js
+++ b/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js
@@ -2,11 +2,11 @@ System.register(['./generated-bar.js', './generated-broken.js'], (function () {
 	'use strict';
 	var bar, broken;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			bar = module.b;
-		}), (function (module) {
+		}, function (module) {
 			broken = module.b;
-		})],
+		}],
 		execute: (function () {
 
 			bar();
diff --git a/test/chunking-form/samples/nested-chunks/_expected/system/main1.js b/test/chunking-form/samples/nested-chunks/_expected/system/main1.js
index 82970ffba59..10d6348547d 100644
--- a/test/chunking-form/samples/nested-chunks/_expected/system/main1.js
+++ b/test/chunking-form/samples/nested-chunks/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function (exports, module) {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main1', value);
diff --git a/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js
index dfdf7de3e31..6de795a1d50 100644
--- a/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js
+++ b/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js
@@ -2,9 +2,9 @@ System.register(['../generated-dep.js'], (function (exports, module) {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.v;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main2', value);
diff --git a/test/chunking-form/samples/no-minify-internal-exports/_expected/system/main1.js b/test/chunking-form/samples/no-minify-internal-exports/_expected/system/main1.js
index a80223bb798..22bcab2a084 100644
--- a/test/chunking-form/samples/no-minify-internal-exports/_expected/system/main1.js
+++ b/test/chunking-form/samples/no-minify-internal-exports/_expected/system/main1.js
@@ -2,11 +2,11 @@ System.register(['./generated-shared2.js'], (function () {
 	'use strict';
 	var shared1, shared2, foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared1 = module.shared1;
 			shared2 = module.shared2;
 			foo = module.foo;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(shared1, shared2, foo);
diff --git a/test/chunking-form/samples/no-minify-internal-exports/_expected/system/main2.js b/test/chunking-form/samples/no-minify-internal-exports/_expected/system/main2.js
index 0f54411c01a..a428d3a434f 100644
--- a/test/chunking-form/samples/no-minify-internal-exports/_expected/system/main2.js
+++ b/test/chunking-form/samples/no-minify-internal-exports/_expected/system/main2.js
@@ -2,11 +2,11 @@ System.register(['./generated-shared2.js'], (function () {
 	'use strict';
 	var shared1, shared2, foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared1 = module.shared1;
 			shared2 = module.shared2;
 			foo = module.foo$1;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(shared1, shared2, foo);
diff --git a/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/system/generated-dynamic.js b/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/system/generated-dynamic.js
index e9eb2a15b84..3dfd6db40f0 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/system/generated-dynamic.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function () {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			globalThis.sharedDynamic = shared;
diff --git a/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/system/generated-dynamic.js b/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/system/generated-dynamic.js
index e9eb2a15b84..3dfd6db40f0 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/system/generated-dynamic.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function () {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			globalThis.sharedDynamic = shared;
diff --git a/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/system/generated-dynamic.js b/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/system/generated-dynamic.js
index 02d9adaa986..76d2f1834e0 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/system/generated-dynamic.js
@@ -2,9 +2,9 @@ System.register(['./generated-main.js'], (function () {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			globalThis.sharedDynamic = shared;
diff --git a/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/system/main.js b/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/system/main.js
index f8980996999..461d214ff24 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports({ dynamic: module.d, unused: module.u });
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/preserve-entry-signatures/false/_expected/system/generated-dynamic.js b/test/chunking-form/samples/preserve-entry-signatures/false/_expected/system/generated-dynamic.js
index e9eb2a15b84..3dfd6db40f0 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/false/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/false/_expected/system/generated-dynamic.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function () {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			globalThis.sharedDynamic = shared;
diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic.js
index e8c189c9d92..316ac53ece9 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic.js
@@ -2,9 +2,9 @@ System.register(['./generated-main.js'], (function () {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(shared);
diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic2.js
index 2800314c5a8..81383bdb137 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic2.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic2.js
@@ -2,9 +2,9 @@ System.register(['./generated-allow-extension.js'], (function () {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(shared);
diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic3.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic3.js
index cf68c78b77c..1978c684efc 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic3.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic3.js
@@ -2,9 +2,9 @@ System.register(['./generated-false.js'], (function () {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(shared);
diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic4.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic4.js
index ae6e52ee133..3ee0f88c5b7 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic4.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-dynamic4.js
@@ -2,9 +2,9 @@ System.register(['./generated-not-specified.js'], (function () {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(shared);
diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-strict.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-strict.js
index 982f678bfe6..f0df4f307be 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-strict.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/system/generated-strict.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('unused', module.u);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/system/generated-dynamic.js b/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/system/generated-dynamic.js
index 02d9adaa986..76d2f1834e0 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/system/generated-dynamic.js
@@ -2,9 +2,9 @@ System.register(['./generated-main.js'], (function () {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			globalThis.sharedDynamic = shared;
diff --git a/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/system/main.js b/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/system/main.js
index f8980996999..461d214ff24 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports({ dynamic: module.d, unused: module.u });
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-dynamic.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-dynamic.js
index 02d9adaa986..76d2f1834e0 100644
--- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-dynamic.js
+++ b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-dynamic.js
@@ -2,9 +2,9 @@ System.register(['./generated-main.js'], (function () {
 	'use strict';
 	var shared;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			shared = module.s;
-		})],
+		}],
 		execute: (function () {
 
 			globalThis.sharedDynamic = shared;
diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js
index 8fb19f5b2a1..359bf0ce6d7 100644
--- a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js
@@ -2,12 +2,12 @@ System.register(['./default.js', './named.js'], (function (exports, module) {
 	'use strict';
 	var foo, value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module["default"];
 			exports('default', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			value = module.value;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, value);
diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js
index 3e401e08a53..0df36bf9a75 100644
--- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js
+++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js
@@ -2,11 +2,11 @@ System.register(['external', './other.js', './_virtual/other.js_commonjs-exports
 	'use strict';
 	var require$$0, other;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			require$$0 = module["default"];
-		}), function () {}, (function (module) {
+		}, function () {}, function (module) {
 			other = module.__exports;
-		})],
+		}],
 		execute: (function () {
 
 			const external = require$$0;
diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js
index 094b5019f84..e0920e59542 100644
--- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js
@@ -2,11 +2,11 @@ System.register(['./commonjs.js', 'external'], (function () {
 	'use strict';
 	var commonjs, require$$0;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			commonjs = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			require$$0 = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log(commonjs, require$$0);
diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js
index d79a26cd9a8..0c908825185 100644
--- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js
+++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/other.js
@@ -2,10 +2,10 @@ System.register(['./_virtual/other.js_commonjs-exports'], (function (exports) {
 	'use strict';
 	var other;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			other = module.__exports;
 			exports('default', module.__exports);
-		})],
+		}],
 		execute: (function () {
 
 			other.value = 43;
diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/system/main.js
index 188a546ea21..d53e79fcbc4 100644
--- a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./lib.js'], (function (exports, module) {
 	'use strict';
 	var lib;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib = module;
 			exports('lib', module);
-		})],
+		}],
 		execute: (function () {
 
 			console.log(lib);
diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/system/main.js
index 3523ee2a73d..3dfb2cd9a0f 100644
--- a/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./lib.js'], (function () {
 	'use strict';
 	var lib;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib = module;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(lib);
diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/m1.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/m1.js
index e82ee117d67..4151f28d873 100644
--- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/m1.js
+++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/m1.js
@@ -1,11 +1,11 @@
 System.register(['./m2.js', './m3.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('m2', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('m3', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/main.js
index d062c6d2b33..2055d1533cc 100644
--- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./m1.js'], (function () {
 	'use strict';
 	var m1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			m1 = module;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(m1);
diff --git a/test/chunking-form/samples/preserve-modules-empty/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-empty/_expected/system/main.js
index 851995c32dd..92dd66d8318 100644
--- a/test/chunking-form/samples/preserve-modules-empty/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-empty/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./two.js'], (function () {
 	'use strict';
 	var a;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			a = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			window.APP = { a };
diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/system/main1.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/system/main1.js
index b108a9ef094..ab503c81cbb 100644
--- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/system/main1.js
+++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/system/main1.js
@@ -1,9 +1,9 @@
 System.register(['./dep.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports({ bar: module.foo, foo: module.foo });
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/system/main2.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/system/main2.js
index e81ad7416c2..47fbb8724e8 100644
--- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/system/main2.js
+++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/system/main2.js
@@ -1,9 +1,9 @@
 System.register(['./dep.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('bar', module.foo);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js
index d54e95cf13e..da12f8cc61b 100644
--- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js
+++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js
@@ -1,17 +1,17 @@
 System.register(['./entry-foo-system-ts.ts.js', './nested/entry-bar-system-ts.ts.js', './nested/entry-baz-system-ts.ts.js', './entry-lorem-system-str.str.str.js', './entry-no-ext-system-.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('foo', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('bar', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('baz', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('lorem', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('noExt', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/main.js
index b376f2a1e8b..1c73614dc6c 100644
--- a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/main.js
@@ -2,13 +2,13 @@ System.register(['./_virtual/_one.js', './_virtual/_One2.js', './_virtual/_One1.
 	'use strict';
 	var a, b, c;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			a = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			b = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			c = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			window.APP = { a, b, c };
diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js
index 8fb19f5b2a1..359bf0ce6d7 100644
--- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js
@@ -2,12 +2,12 @@ System.register(['./default.js', './named.js'], (function (exports, module) {
 	'use strict';
 	var foo, value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module["default"];
 			exports('default', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			value = module.value;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, value);
diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/system/main.js
index 88bb8f5e770..ef257319d66 100644
--- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/system/main.js
@@ -1,11 +1,11 @@
 System.register(['./module-a/v1/index.js', './module-b/v1/index.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('ModuleA_V1', module);
-		}), (function (module) {
+		}, function (module) {
 			exports('ModuleB_V1', module);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main.js
index 5da0687e70c..2f734b5c3b5 100644
--- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register(['./inner/more_inner/something.js', './inner/some_effect.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('Something', module.Something);
-		}), function () {}],
+		}, function () {}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js
index 0d7bf980fa6..820cf65b907 100644
--- a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./dep2.js'], (function (exports) {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module["default"];
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/main.js
index e17c78ea005..d5764dd2de7 100644
--- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['external'], (function () {
 	'use strict';
 	var path;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			path = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log(path.normalize('foo\\bar'));
diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/proxy.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/proxy.js
index 5f2bfdcd16d..54718c7b73d 100644
--- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/proxy.js
+++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/proxy.js
@@ -2,10 +2,10 @@ System.register(['external'], (function (exports) {
 	'use strict';
 	var path;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			path = module["default"];
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/system/lib/main.js b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/system/lib/main.js
index 2caf46e13e5..440f4c9f9c1 100644
--- a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/system/lib/main.js
+++ b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/system/lib/main.js
@@ -2,9 +2,9 @@ System.register(['../dep.js'], (function (exports) {
   'use strict';
   var fn;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn = module.fn;
-    })],
+    }],
     execute: (function () {
 
       class Main {
diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js
index bb0f98ca53c..9544e4c8178 100644
--- a/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js
+++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js
@@ -2,9 +2,9 @@ System.register(['../custom_modules/@my-scope/my-base-pkg/index.js', '../_virtua
   'use strict';
   var myBasePkg;
   return {
-    setters: [function () {}, (function (module) {
+    setters: [function () {}, function (module) {
       myBasePkg = module.__exports;
-    })],
+    }],
     execute: (function () {
 
       const base2 = myBasePkg;
diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js
index 23cc3c5ace4..840aa037c93 100644
--- a/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js
+++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/custom_modules/@my-scope/my-base-pkg/index.js
@@ -2,10 +2,10 @@ System.register(['../../../_virtual/index.js_commonjs-exports'], (function (expo
 	'use strict';
 	var myBasePkg;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			myBasePkg = module.__exports;
 			exports('default', module.__exports);
-		})],
+		}],
 		execute: (function () {
 
 			Object.defineProperty(myBasePkg, '__esModule', { value: true });
diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js
index d7400ca411f..178399de6aa 100644
--- a/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js
+++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js
@@ -2,9 +2,9 @@ System.register(['./custom_modules/@my-scope/my-base-pkg/index.js', './_virtual/
 	'use strict';
 	var myBasePkg;
 	return {
-		setters: [function () {}, (function (module) {
+		setters: [function () {}, function (module) {
 			myBasePkg = module.__exports;
-		})],
+		}],
 		execute: (function () {
 
 			const base = myBasePkg;
diff --git a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/system/main.js
index d5d1a215302..f888ea474be 100644
--- a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/system/main.js
@@ -1,13 +1,13 @@
 System.register(['./answer.num.js', './lorem.str.js', './no-ext.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('answer', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('lorem', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports('noExt', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/main.js
index 65160362233..eed2c557e47 100644
--- a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/main.js
+++ b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./_virtual/_virtualModule'], (function () {
 	'use strict';
 	var virtual;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			virtual = module.virtual;
-		})],
+		}],
 		execute: (function () {
 
 			assert.equal(virtual, 'Virtual!');
diff --git a/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep2.js b/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep2.js
index a5ab3c9b04b..266a74dbe31 100644
--- a/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep2.js
+++ b/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep2.js
@@ -2,9 +2,9 @@ System.register(['../lib/lib2.js'], (function (exports) {
   'use strict';
   var fn$1;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$1 = module.fn;
-    })],
+    }],
     execute: (function () {
 
       exports('fn', fn);
diff --git a/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep3.js b/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep3.js
index 77d78f6632d..c7293a4ee0a 100644
--- a/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep3.js
+++ b/test/chunking-form/samples/preserve-modules/_expected/system/deps/dep3.js
@@ -2,9 +2,9 @@ System.register(['../lib/lib1.js'], (function (exports) {
   'use strict';
   var fn$1;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$1 = module.fn;
-    })],
+    }],
     execute: (function () {
 
       exports('fn', fn);
diff --git a/test/chunking-form/samples/preserve-modules/_expected/system/main1.js b/test/chunking-form/samples/preserve-modules/_expected/system/main1.js
index aa823fcd2ff..a8ee090a600 100644
--- a/test/chunking-form/samples/preserve-modules/_expected/system/main1.js
+++ b/test/chunking-form/samples/preserve-modules/_expected/system/main1.js
@@ -2,11 +2,11 @@ System.register(['./deps/dep1.js', './deps/dep2.js'], (function (exports) {
   'use strict';
   var fn, fn$1;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn = module.fn;
-    }), (function (module) {
+    }, function (module) {
       fn$1 = module.fn;
-    })],
+    }],
     execute: (function () {
 
       class Main1 {
diff --git a/test/chunking-form/samples/preserve-modules/_expected/system/main2.js b/test/chunking-form/samples/preserve-modules/_expected/system/main2.js
index 1a268cf99df..b2fe3e01268 100644
--- a/test/chunking-form/samples/preserve-modules/_expected/system/main2.js
+++ b/test/chunking-form/samples/preserve-modules/_expected/system/main2.js
@@ -2,11 +2,11 @@ System.register(['./deps/dep2.js', './deps/dep3.js'], (function (exports) {
   'use strict';
   var fn$1, fn;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       fn$1 = module.fn;
-    }), (function (module) {
+    }, function (module) {
       fn = module.fn;
-    })],
+    }],
     execute: (function () {
 
       class Main2 {
diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js
index 024fabbb03f..34e0bc372f6 100644
--- a/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js
+++ b/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register(['./generated-otherEntry.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports({ a: module.a, c: module.c });
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js
index f336b377777..e3d5f9996e7 100644
--- a/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js
+++ b/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js
@@ -1,9 +1,9 @@
 System.register(['./generated-otherEntry.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports({ b: module.b, c: module.c });
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js
index ae0948583d2..ef67c7ff36d 100644
--- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js
+++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js
@@ -2,10 +2,10 @@ System.register(['./generated-dep2.js'], (function (exports) {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.f;
 			exports('default', module.f);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/render-chunk/_expected/system/main1.js b/test/chunking-form/samples/render-chunk/_expected/system/main1.js
index 61986cb0c7f..41a4c734157 100644
--- a/test/chunking-form/samples/render-chunk/_expected/system/main1.js
+++ b/test/chunking-form/samples/render-chunk/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./chunk-dep2.js'], (function () {
 	'use strict';
 	var num$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			num$1 = module.n;
-		})],
+		}],
 		execute: (function () {
 
 			var num = 1;
diff --git a/test/chunking-form/samples/render-chunk/_expected/system/main2.js b/test/chunking-form/samples/render-chunk/_expected/system/main2.js
index f5d21497861..72988d3a16e 100644
--- a/test/chunking-form/samples/render-chunk/_expected/system/main2.js
+++ b/test/chunking-form/samples/render-chunk/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./chunk-dep2.js'], (function () {
 	'use strict';
 	var num$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			num$1 = module.n;
-		})],
+		}],
 		execute: (function () {
 
 			var num = 3;
diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-lazy.js
index be3b71f4104..f5fcdee94e4 100644
--- a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-lazy.js
+++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-lazy.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function (exports) {
 	'use strict';
 	var v1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			v1 = module.v1;
-		})],
+		}],
 		execute: (function () {
 
 			var lazy = exports('default', () => v1);
diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/system/main.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/system/main.js
index 313d969404c..fc9155ecdac 100644
--- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/system/main.js
+++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/system/main.js
@@ -2,11 +2,11 @@ System.register(['./a.js', './one.js'], (function () {
 	'use strict';
 	var a, d;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			a = module.a;
-		}), (function (module) {
+		}, function (module) {
 			d = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(a + d);
diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/system/one.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/system/one.js
index d2612d0c60d..4819936a27b 100644
--- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/system/one.js
+++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/system/one.js
@@ -2,9 +2,9 @@ System.register(['./b.js'], (function (exports) {
 	'use strict';
 	var b;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			b = module.b;
-		})],
+		}],
 		execute: (function () {
 
 			const d = exports('d', b + 4);
diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-component.js
index e7d26a131ec..9e5346259c6 100644
--- a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-component.js
+++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-component.js
@@ -2,9 +2,9 @@ System.register(['./generated-main.js'], (function (exports) {
 	'use strict';
 	var lib;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib = module.l;
-		})],
+		}],
 		execute: (function () {
 
 			var component = { lib, lib2: lib.named, lib3: lib.named.named };
diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/main.js
index 77624244519..067ba0d1015 100644
--- a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/main.js
+++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/main.js
@@ -2,10 +2,10 @@ System.register(['./generated-main.js'], (function (exports) {
 	'use strict';
 	var lib;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib = module.l;
 			exports('component', module.c);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js
index 3231d37ba3b..0cb68053ea6 100644
--- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js
+++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main1.js
@@ -2,10 +2,10 @@ System.register(['./generated-lib.js'], (function (exports) {
 	'use strict';
 	var lib;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib = module.l;
 			exports('lib', module.l);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main2.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main2.js
index 92603e2aac4..6ccd7873e05 100644
--- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main2.js
+++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib.js'], (function () {
 	'use strict';
 	var lib;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib = module.l;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(lib, lib.foo, lib.bar, lib.baz);
diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main3.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main3.js
index ed9123cc17e..e90653e7345 100644
--- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main3.js
+++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/system/main3.js
@@ -2,9 +2,9 @@ System.register(['./generated-lib.js'], (function (exports) {
 	'use strict';
 	var lib;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib = module.l;
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/generated-component.js
index 90cb5ef61cd..e3540558fe3 100644
--- a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/generated-component.js
+++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/generated-component.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function (exports) {
 	'use strict';
 	var lib;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			lib = module.lib;
-		})],
+		}],
 		execute: (function () {
 
 			var component = { lib, someExport: lib.someExport };
diff --git a/test/chunking-form/samples/synthetic-named-exports/entry/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/entry/_expected/system/main.js
index d2c9d909459..26b3b6e3154 100644
--- a/test/chunking-form/samples/synthetic-named-exports/entry/_expected/system/main.js
+++ b/test/chunking-form/samples/synthetic-named-exports/entry/_expected/system/main.js
@@ -1,9 +1,9 @@
 System.register(['./generated-main.js'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('exists', module.e);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/synthetic-named-exports/entry/_expected/system/other.js b/test/chunking-form/samples/synthetic-named-exports/entry/_expected/system/other.js
index a3e17c4efbf..524d4416c9d 100644
--- a/test/chunking-form/samples/synthetic-named-exports/entry/_expected/system/other.js
+++ b/test/chunking-form/samples/synthetic-named-exports/entry/_expected/system/other.js
@@ -2,9 +2,9 @@ System.register(['./generated-main.js'], (function () {
 	'use strict';
 	var __synthetic;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			__synthetic = module._;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(__synthetic.synthetic);
diff --git a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/main.js
index d80ee0346a9..57904850333 100644
--- a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/main.js
+++ b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/main.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep2.js'], (function () {
 	'use strict';
 	var dep2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			dep2 = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(dep2.bar.foo);
diff --git a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/main2.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/main2.js
index d80ee0346a9..57904850333 100644
--- a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/main2.js
+++ b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports-2/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep2.js'], (function () {
 	'use strict';
 	var dep2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			dep2 = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(dep2.bar.foo);
diff --git a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main2.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main2.js
index fae82df6589..9131d2dd02d 100644
--- a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main2.js
+++ b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function (exports) {
 	'use strict';
 	var main;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			main = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main3.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main3.js
index d669f110f5f..473b9c2aff1 100644
--- a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main3.js
+++ b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main3.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function (exports) {
 	'use strict';
 	var main;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			main = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main4.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main4.js
index e9804e3730b..e5225f8d01b 100644
--- a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main4.js
+++ b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main4.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function (exports) {
 	'use strict';
 	var main;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			main = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main5.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main5.js
index 474062d6310..76a808fda2b 100644
--- a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main5.js
+++ b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main5.js
@@ -2,9 +2,9 @@ System.register(['./main.js'], (function (exports) {
 	'use strict';
 	var main;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			main = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main1.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main1.js
index ddbcdc9fa1c..9024cabcf1f 100644
--- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main1.js
+++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main1.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var dep;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			dep = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('1', dep);
diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main2.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main2.js
index 0da13887d44..b3ce5d94b99 100644
--- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main2.js
+++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main2.js
@@ -2,9 +2,9 @@ System.register(['./generated-dep.js'], (function () {
 	'use strict';
 	var dep;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			dep = module.d;
-		})],
+		}],
 		execute: (function () {
 
 			console.log('2', dep);
diff --git a/test/cli/samples/format-aliases/_expected/system.js b/test/cli/samples/format-aliases/_expected/system.js
index 28062b53239..c91b0222187 100644
--- a/test/cli/samples/format-aliases/_expected/system.js
+++ b/test/cli/samples/format-aliases/_expected/system.js
@@ -1,9 +1,9 @@
 System.register('bundle', ['external'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('value', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main');
diff --git a/test/cli/samples/format-aliases/_expected/systemjs.js b/test/cli/samples/format-aliases/_expected/systemjs.js
index 28062b53239..c91b0222187 100644
--- a/test/cli/samples/format-aliases/_expected/systemjs.js
+++ b/test/cli/samples/format-aliases/_expected/systemjs.js
@@ -1,9 +1,9 @@
 System.register('bundle', ['external'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('value', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 			console.log('main');
diff --git a/test/cli/samples/generated-code-preset-override/_expected.js b/test/cli/samples/generated-code-preset-override/_expected.js
index 10ec15b4c4d..e606a42aa5b 100644
--- a/test/cli/samples/generated-code-preset-override/_expected.js
+++ b/test/cli/samples/generated-code-preset-override/_expected.js
@@ -1,7 +1,7 @@
-System.register([], (exports => {
+System.register([], (function (exports) {
 	'use strict';
 	return {
-		execute: (() => {
+		execute: (function () {
 
 			const foo = 1; exports({ foo: foo, bar: foo, 'default': foo });
 
diff --git a/test/form/samples/compact-multiple-imports/_expected/system.js b/test/form/samples/compact-multiple-imports/_expected/system.js
index d7481e35259..af7b2011968 100644
--- a/test/form/samples/compact-multiple-imports/_expected/system.js
+++ b/test/form/samples/compact-multiple-imports/_expected/system.js
@@ -1,2 +1,2 @@
-System.register(['external-1','external-2','external-3','external-4','external-5'],(function(){'use strict';var value,value$1;return{setters:[function(){},function(){},(function(module){value=module.value;}),(function(module){value$1=module.value;}),function(){}],execute:(function(){assert.equal(value, '3');
+System.register(['external-1','external-2','external-3','external-4','external-5'],(function(){'use strict';var value,value$1;return{setters:[function(){},function(){},function(module){value=module.value;},function(module){value$1=module.value;},function(){}],execute:(function(){assert.equal(value, '3');
 assert.equal(value$1, '4');})}}));
\ No newline at end of file
diff --git a/test/form/samples/compact/_expected/system.js b/test/form/samples/compact/_expected/system.js
index 787d5de37eb..9211a59a514 100644
--- a/test/form/samples/compact/_expected/system.js
+++ b/test/form/samples/compact/_expected/system.js
@@ -1,4 +1,4 @@
-System.register('foo',['external'],(function(exports){'use strict';var x;return{setters:[(function(module){x=module["default"];})],execute:(function(){exports('default',foo);var self=/*#__PURE__*/Object.freeze({__proto__:null,[Symbol.toStringTag]:'Module',get default(){return foo}});console.log(self);
+System.register('foo',['external'],(function(exports){'use strict';var x;return{setters:[function(module){x=module["default"];}],execute:(function(){exports('default',foo);var self=/*#__PURE__*/Object.freeze({__proto__:null,[Symbol.toStringTag]:'Module',get default(){return foo}});console.log(self);
 function foo () {
 	console.log( x );
 }
diff --git a/test/form/samples/conflicting-imports/_expected/system.js b/test/form/samples/conflicting-imports/_expected/system.js
index b2cb052b043..815a407593f 100644
--- a/test/form/samples/conflicting-imports/_expected/system.js
+++ b/test/form/samples/conflicting-imports/_expected/system.js
@@ -2,11 +2,11 @@ System.register(['foo', 'bar'], (function () {
 	'use strict';
 	var a$1, a;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			a$1 = module.a;
-		}), (function (module) {
+		}, function (module) {
 			a = module.a;
-		})],
+		}],
 		execute: (function () {
 
 			console.log( a );
diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/system.js b/test/form/samples/deconflict-format-specific-globals/_expected/system.js
index c505048abb2..08fa3a225f2 100644
--- a/test/form/samples/deconflict-format-specific-globals/_expected/system.js
+++ b/test/form/samples/deconflict-format-specific-globals/_expected/system.js
@@ -2,9 +2,9 @@ System.register('bundle', ['external'], (function (exports, module) {
 	'use strict';
 	var external;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			external = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log(external);
diff --git a/test/form/samples/dedupes-external-imports/_expected/system.js b/test/form/samples/dedupes-external-imports/_expected/system.js
index 432e36d0e30..7638b9fa8cc 100644
--- a/test/form/samples/dedupes-external-imports/_expected/system.js
+++ b/test/form/samples/dedupes-external-imports/_expected/system.js
@@ -2,9 +2,9 @@ System.register('myBundle', ['external'], (function (exports) {
 	'use strict';
 	var Component;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			Component = module.Component;
-		})],
+		}],
 		execute: (function () {
 
 			class Foo extends Component {
diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js
index 655a772a36c..573c86be0b3 100644
--- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js
+++ b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js
@@ -2,15 +2,15 @@ System.register(['external-false', 'external-true'], (function (exports, module)
 	'use strict';
 	var fooFalse__default, barFalse, fooFalse, fooTrue__default, barTrue, fooTrue;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			fooFalse__default = module["default"];
 			barFalse = module.barFalse;
 			fooFalse = module;
-		}), (function (module) {
+		}, function (module) {
 			fooTrue__default = module["default"];
 			barTrue = module.barTrue;
 			fooTrue = module;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(fooFalse__default, barFalse, fooFalse);
diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js
index ab68336388a..3c2ac056e9e 100644
--- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js
+++ b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js
@@ -1,11 +1,11 @@
 System.register('bundle', ['external-false', 'external-true'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports({ barFalse: module.barFalse, externalFalse: module, fooFalse: module["default"] });
-		}), (function (module) {
+		}, function (module) {
 			exports({ barTrue: module.barTrue, externalTrue: module, fooTrue: module["default"] });
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/system.js b/test/form/samples/deprecated/interop-false-reexport/_expected/system.js
index 72697ee5134..fb6f0069427 100644
--- a/test/form/samples/deprecated/interop-false-reexport/_expected/system.js
+++ b/test/form/samples/deprecated/interop-false-reexport/_expected/system.js
@@ -1,9 +1,9 @@
 System.register('foo', ['external'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports({ p: module["default"], q: module.p });
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/deprecated/interop-false/_expected/system.js b/test/form/samples/deprecated/interop-false/_expected/system.js
index 5832c05d83f..3cd77a0ac33 100644
--- a/test/form/samples/deprecated/interop-false/_expected/system.js
+++ b/test/form/samples/deprecated/interop-false/_expected/system.js
@@ -2,9 +2,9 @@ System.register('foo', ['core/view'], (function (exports) {
 	'use strict';
 	var View;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			View = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			var main = exports('default', View.extend({}));
diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/amd.js b/test/form/samples/dynamic-import-this-arrow/_expected/amd.js
index be311696102..abfb599614c 100644
--- a/test/form/samples/dynamic-import-this-arrow/_expected/amd.js
+++ b/test/form/samples/dynamic-import-this-arrow/_expected/amd.js
@@ -1,4 +1,4 @@
-define(['require', 'exports', 'input'], ((require, exports, input) => { 'use strict';
+define(['require', 'exports', 'input'], (function (require, exports, input) { 'use strict';
 
 	function _interopNamespace(e) {
 		if (e && e.__esModule) return e;
diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/iife.js b/test/form/samples/dynamic-import-this-arrow/_expected/iife.js
index ac8fb6deadd..cae64e05522 100644
--- a/test/form/samples/dynamic-import-this-arrow/_expected/iife.js
+++ b/test/form/samples/dynamic-import-this-arrow/_expected/iife.js
@@ -1,4 +1,4 @@
-var bundle = ((exports, input) => {
+var bundle = (function (exports, input) {
 	'use strict';
 
 	class Importer {
diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/system.js b/test/form/samples/dynamic-import-this-arrow/_expected/system.js
index 9e7d5ae67cf..24beec803c2 100644
--- a/test/form/samples/dynamic-import-this-arrow/_expected/system.js
+++ b/test/form/samples/dynamic-import-this-arrow/_expected/system.js
@@ -1,11 +1,11 @@
-System.register('bundle', ['input'], ((exports, module) => {
+System.register('bundle', ['input'], (function (exports, module) {
 	'use strict';
 	var outputPath;
 	return {
-		setters: [(module => {
+		setters: [module => {
 			outputPath = module.outputPath;
-		})],
-		execute: (() => {
+		}],
+		execute: (function () {
 
 			class Importer {
 				constructor() {
diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/umd.js b/test/form/samples/dynamic-import-this-arrow/_expected/umd.js
index ce1d4c832e2..012afb22eb7 100644
--- a/test/form/samples/dynamic-import-this-arrow/_expected/umd.js
+++ b/test/form/samples/dynamic-import-this-arrow/_expected/umd.js
@@ -1,8 +1,8 @@
-((global, factory) => {
+(function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('input')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'input'], factory) :
 	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.input));
-})(this, ((exports, input) => { 'use strict';
+})(this, (function (exports, input) { 'use strict';
 
 	class Importer {
 		constructor() {
diff --git a/test/form/samples/dynamic-import-this-function/_expected/system.js b/test/form/samples/dynamic-import-this-function/_expected/system.js
index 5a9dab072b8..adf24a664b1 100644
--- a/test/form/samples/dynamic-import-this-function/_expected/system.js
+++ b/test/form/samples/dynamic-import-this-function/_expected/system.js
@@ -2,9 +2,9 @@ System.register('bundle', ['input'], (function (exports, module) {
 	'use strict';
 	var outputPath;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			outputPath = module.outputPath;
-		})],
+		}],
 		execute: (function () {
 
 			class Importer {
diff --git a/test/form/samples/export-all-before-named/_expected/system.js b/test/form/samples/export-all-before-named/_expected/system.js
index 1dd06325b85..70e4131f443 100644
--- a/test/form/samples/export-all-before-named/_expected/system.js
+++ b/test/form/samples/export-all-before-named/_expected/system.js
@@ -2,13 +2,13 @@ System.register('exposedInternals', ['external'], (function (exports) {
 	'use strict';
 	var _starExcludes = { internalFn: 1, 'default': 1 };
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			var setter = {};
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		})],
+		}],
 		execute: (function () {
 
 			exports('internalFn', internalFn);
diff --git a/test/form/samples/export-all-multiple/_expected/system.js b/test/form/samples/export-all-multiple/_expected/system.js
index bfa3969de5f..b1ff4ae2a99 100644
--- a/test/form/samples/export-all-multiple/_expected/system.js
+++ b/test/form/samples/export-all-multiple/_expected/system.js
@@ -2,25 +2,25 @@ System.register('myBundle', ['foo', 'bar', 'baz'], (function (exports) {
 	'use strict';
 	var _starExcludes = { 'default': 1 };
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			var setter = {};
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		}), (function (module) {
+		}, function (module) {
 			var setter = {};
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		}), (function (module) {
+		}, function (module) {
 			var setter = {};
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/export-default-import/_expected/system.js b/test/form/samples/export-default-import/_expected/system.js
index 76ae276b7c9..6f6dd8d6cb9 100644
--- a/test/form/samples/export-default-import/_expected/system.js
+++ b/test/form/samples/export-default-import/_expected/system.js
@@ -1,9 +1,9 @@
 System.register('myBundle', ['x'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('x', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/external-deshadowing/_expected/system.js b/test/form/samples/external-deshadowing/_expected/system.js
index a2a1e2d8a43..fa1385c7e7b 100644
--- a/test/form/samples/external-deshadowing/_expected/system.js
+++ b/test/form/samples/external-deshadowing/_expected/system.js
@@ -2,11 +2,11 @@ System.register('myBundle', ['a', 'b'], (function (exports) {
   'use strict';
   var Test$1, Test$2;
   return {
-    setters: [(function (module) {
+    setters: [function (module) {
       Test$1 = module.Test;
-    }), (function (module) {
+    }, function (module) {
       Test$2 = module["default"];
-    })],
+    }],
     execute: (function () {
 
       const Test = exports('Test', () => {
diff --git a/test/form/samples/external-empty-import-no-global-b/_expected/system.js b/test/form/samples/external-empty-import-no-global-b/_expected/system.js
index 4f137ff14ec..e14f7ee517f 100644
--- a/test/form/samples/external-empty-import-no-global-b/_expected/system.js
+++ b/test/form/samples/external-empty-import-no-global-b/_expected/system.js
@@ -2,9 +2,9 @@ System.register('myBundle', ['babel-polyfill', 'other'], (function (exports) {
 	'use strict';
 	var x;
 	return {
-		setters: [function () {}, (function (module) {
+		setters: [function () {}, function (module) {
 			x = module.x;
-		})],
+		}],
 		execute: (function () {
 
 			x();
diff --git a/test/form/samples/external-export-tracing/_expected/system.js b/test/form/samples/external-export-tracing/_expected/system.js
index 98a26914ad2..041d4054c49 100644
--- a/test/form/samples/external-export-tracing/_expected/system.js
+++ b/test/form/samples/external-export-tracing/_expected/system.js
@@ -1,9 +1,9 @@
 System.register('myBundle', ['external'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('s', module.p);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/external-import-alias-shadow/_expected/system.js b/test/form/samples/external-import-alias-shadow/_expected/system.js
index e9578736dff..176ff3d7dbf 100644
--- a/test/form/samples/external-import-alias-shadow/_expected/system.js
+++ b/test/form/samples/external-import-alias-shadow/_expected/system.js
@@ -2,9 +2,9 @@ System.register(['acorn'], (function () {
 	'use strict';
 	var parse$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			parse$1 = module.parse;
-		})],
+		}],
 		execute: (function () {
 
 			function parse(source) {
diff --git a/test/form/samples/external-imports-custom-names-function/_expected/system.js b/test/form/samples/external-imports-custom-names-function/_expected/system.js
index 8541860b7d1..1143e473ecf 100644
--- a/test/form/samples/external-imports-custom-names-function/_expected/system.js
+++ b/test/form/samples/external-imports-custom-names-function/_expected/system.js
@@ -2,9 +2,9 @@ System.register(['a-b-c'], (function () {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.foo;
-		})],
+		}],
 		execute: (function () {
 
 			foo();
diff --git a/test/form/samples/external-imports-custom-names/_expected/system.js b/test/form/samples/external-imports-custom-names/_expected/system.js
index 064d785cea1..70d58358417 100644
--- a/test/form/samples/external-imports-custom-names/_expected/system.js
+++ b/test/form/samples/external-imports-custom-names/_expected/system.js
@@ -2,9 +2,9 @@ System.register(['jquery'], (function () {
 	'use strict';
 	var $;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			$ = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			$( function () {
diff --git a/test/form/samples/external-imports/_expected/system.js b/test/form/samples/external-imports/_expected/system.js
index 077f759bc88..75adb26d031 100644
--- a/test/form/samples/external-imports/_expected/system.js
+++ b/test/form/samples/external-imports/_expected/system.js
@@ -2,18 +2,18 @@ System.register(['factory', 'baz', 'shipping-port', 'alphabet'], (function () {
 	'use strict';
 	var factory, foo, bar, port, containers, a, alphabet;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			factory = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			foo = module.foo;
 			bar = module.bar;
-		}), (function (module) {
+		}, function (module) {
 			port = module.port;
 			containers = module;
-		}), (function (module) {
+		}, function (module) {
 			a = module.a;
 			alphabet = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			factory( null );
diff --git a/test/form/samples/external-namespace-and-named/_expected/system.js b/test/form/samples/external-namespace-and-named/_expected/system.js
index 41c79ae58b1..afb78f8ac71 100644
--- a/test/form/samples/external-namespace-and-named/_expected/system.js
+++ b/test/form/samples/external-namespace-and-named/_expected/system.js
@@ -2,11 +2,11 @@ System.register(['foo'], (function () {
 	'use strict';
 	var foo, blah, bar;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module;
 			blah = module.blah;
 			bar = module.bar;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo);
diff --git a/test/form/samples/external-namespace-reexport/_expected/system.js b/test/form/samples/external-namespace-reexport/_expected/system.js
index 403f4569494..3b7f938b108 100644
--- a/test/form/samples/external-namespace-reexport/_expected/system.js
+++ b/test/form/samples/external-namespace-reexport/_expected/system.js
@@ -1,9 +1,9 @@
 System.register('myBundle', ['highcharts'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('Highcharts', module);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js
index 028b2325fe5..5ba31e29c97 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js
@@ -1,4 +1,4 @@
-define(['require','exports','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}function _interopDefault(e){return e&&e.__esModule?e:{'default':e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,'default':e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}});}n["default"]=e;return Object.freeze(n);}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
+define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}function _interopDefault(e){return e&&e.__esModule?e:{'default':e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,'default':e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}});}n["default"]=e;return Object.freeze(n);}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
 
 ({ a: exports.a } = defaultLegacy.b);
 console.log({ a: exports.a } = defaultLegacy.b);
diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js
index 32fe5cc086e..8f64fb3b6d0 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js
@@ -1,4 +1,4 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var defaultLegacy=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}function _interopDefault(e){return e&&e.__esModule?e:{'default':e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,'default':e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}});}n["default"]=e;return Object.freeze(n);}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});require('externalNoImport');var defaultLegacy=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}function _interopDefault(e){return e&&e.__esModule?e:{'default':e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,'default':e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}});}n["default"]=e;return Object.freeze(n);}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
 
 ({ a: exports.a } = defaultLegacy.b);
 console.log({ a: exports.a } = defaultLegacy.b);
diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/es.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/es.js
index 3b64ca8179e..5face3ba66d 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/es.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/es.js
@@ -1,4 +1,4 @@
-import*as defaultLegacy from'external';import defaultLegacy__default,{b}from'external';export*from'external';export{foo}from'external';import externalAuto from'externalAuto';import*as externalDefault from'externalDefault';import*as externalDefaultOnly from'externalDefaultOnly';let a;
+import'externalNoImport';import*as defaultLegacy from'external';import defaultLegacy__default,{b}from'external';export*from'external';export{foo}from'external';import externalAuto from'externalAuto';import*as externalDefault from'externalDefault';import*as externalDefaultOnly from'externalDefaultOnly';let a;
 
 ({ a } = b);
 console.log({ a } = b);
diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js
index 0ca8f6668fa..9231a50b6cf 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js
@@ -1,4 +1,4 @@
-var bundle=(function(exports,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}function _interopDefault(e){return e&&e.__esModule?e:{'default':e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,'default':e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}});}n["default"]=e;return Object.freeze(n);}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
+var bundle=(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}function _interopDefault(e){return e&&e.__esModule?e:{'default':e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,'default':e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}});}n["default"]=e;return Object.freeze(n);}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
 
 ({ a: exports.a } = defaultLegacy.b);
 console.log({ a: exports.a } = defaultLegacy.b);
@@ -9,4 +9,4 @@ import('external').then(console.log);
 console.log(defaultLegacy__default["default"]);
 console.log(externalAuto__default["default"]);
 console.log(externalDefault__namespace);
-console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null),defaultLegacy__namespace,{get a(){return exports.a},foo:foo}));Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})});Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},defaultLegacy,externalAuto,externalDefault,externalDefaultOnly);
\ No newline at end of file
+console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null),defaultLegacy__namespace,{get a(){return exports.a},foo:foo}));Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})});Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},null,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly);
\ No newline at end of file
diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js
index 9d70fa3f5c6..c67502ec5b9 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js
@@ -1,4 +1,4 @@
-System.register('bundle',['external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,'default':1,foo:1};var b,defaultLegacy,defaultLegacy__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[(function(module){b=module.b;defaultLegacy=module;defaultLegacy__default=module["default"];var setter={foo:module.foo};for(var nameinmodule){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);}),(function(module){externalAuto=module["default"];}),(function(module){externalDefault=module;}),(function(module){externalDefaultOnly=module;})],execute:(function(){let a; exports('a',a);
+System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,'default':1,foo:1};var b,defaultLegacy,defaultLegacy__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[function(){},function(module){b=module.b;defaultLegacy=module;defaultLegacy__default=module["default"];var setter={foo:module.foo};for(var nameinmodule){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},function(module){externalAuto=module["default"];},function(module){externalDefault=module;},function(module){externalDefaultOnly=module;}],execute:(function(){let a; exports('a',a);
 
 (function(v){return exports('a',a),v})({ a } = b);
 console.log(function(v){return exports('a',a),v}({ a } = b));
diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js
index 48021009ff4..68d1055c97e 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js
@@ -1,4 +1,4 @@
-(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.bundle={},g.defaultLegacy,g.externalAuto,g.externalDefault,g.externalDefaultOnly));})(this,(function(exports,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}function _interopDefault(e){return e&&e.__esModule?e:{'default':e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,'default':e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}});}n["default"]=e;return Object.freeze(n);}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
+(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.bundle={},null,g.defaultLegacy,g.externalAuto,g.externalDefault,g.externalDefaultOnly));})(this,(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}function _interopDefault(e){return e&&e.__esModule?e:{'default':e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,'default':e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}});}n["default"]=e;return Object.freeze(n);}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
 
 ({ a: exports.a } = defaultLegacy.b);
 console.log({ a: exports.a } = defaultLegacy.b);
diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js
index 299f2351ff1..15e2fcabd4d 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js
@@ -1,4 +1,4 @@
-define(['require','exports','external','externalAuto','externalDefault','externalDefaultOnly'],((require,exports,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly)=>{'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};var _interopDefault=e=>e&&e.__esModule?e:{'default':e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,'default':e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}});}n["default"]=e;return Object.freeze(n);}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
+define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};var _interopDefault=e=>e&&e.__esModule?e:{'default':e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,'default':e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}});}n["default"]=e;return Object.freeze(n);}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
 
 ({ a: exports.a } = defaultLegacy.b);
 console.log({ a: exports.a } = defaultLegacy.b);
diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js
index 591e5fd43b9..6991233fef6 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js
@@ -1,4 +1,4 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var defaultLegacy=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};var _interopDefault=e=>e&&e.__esModule?e:{'default':e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,'default':e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}});}n["default"]=e;return Object.freeze(n);}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});require('externalNoImport');var defaultLegacy=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};var _interopDefault=e=>e&&e.__esModule?e:{'default':e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,'default':e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}});}n["default"]=e;return Object.freeze(n);}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
 
 ({ a: exports.a } = defaultLegacy.b);
 console.log({ a: exports.a } = defaultLegacy.b);
diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/es.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/es.js
index 6c260734d82..76ba52544d6 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/es.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/es.js
@@ -1,4 +1,4 @@
-import*as defaultLegacy from'external';import defaultLegacy__default,{b}from'external';export*from'external';export{foo}from'external';import externalAuto from'externalAuto';import*as externalDefault from'externalDefault';import*as externalDefaultOnly from'externalDefaultOnly';let a;
+import'externalNoImport';import*as defaultLegacy from'external';import defaultLegacy__default,{b}from'external';export*from'external';export{foo}from'external';import externalAuto from'externalAuto';import*as externalDefault from'externalDefault';import*as externalDefaultOnly from'externalDefaultOnly';let a;
 
 ({ a } = b);
 console.log({ a } = b);
diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js
index fa804d60c66..30a0b8c4651 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js
@@ -1,4 +1,4 @@
-var bundle=((exports,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly)=>{'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};var _interopDefault=e=>e&&e.__esModule?e:{'default':e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,'default':e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}});}n["default"]=e;return Object.freeze(n);}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
+var bundle=(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};var _interopDefault=e=>e&&e.__esModule?e:{'default':e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,'default':e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}});}n["default"]=e;return Object.freeze(n);}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
 
 ({ a: exports.a } = defaultLegacy.b);
 console.log({ a: exports.a } = defaultLegacy.b);
@@ -9,4 +9,4 @@ import('external').then(console.log);
 console.log(defaultLegacy__default["default"]);
 console.log(externalAuto__default["default"]);
 console.log(externalDefault__namespace);
-console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null),defaultLegacy__namespace,{get a(){return exports.a},foo:foo}));Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})});Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},defaultLegacy,externalAuto,externalDefault,externalDefaultOnly);
\ No newline at end of file
+console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null),defaultLegacy__namespace,{get a(){return exports.a},foo:foo}));Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})});Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},null,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly);
\ No newline at end of file
diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js
index 0cf0c74f32a..457a0a76857 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js
@@ -1,4 +1,4 @@
-System.register('bundle',['external','externalAuto','externalDefault','externalDefaultOnly'],((exports,module)=>{'use strict';var _starExcludes={a:1,'default':1,foo:1};var b,defaultLegacy,defaultLegacy__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[(module=>{b=module.b;defaultLegacy=module;defaultLegacy__default=module["default"];var setter={foo:module.foo};for(var nameinmodule){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);}),(module=>{externalAuto=module["default"];}),(module=>{externalDefault=module;}),(module=>{externalDefaultOnly=module;})],execute:(()=>{let a; exports('a',a);
+System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,'default':1,foo:1};var b,defaultLegacy,defaultLegacy__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[()=>{},module=>{b=module.b;defaultLegacy=module;defaultLegacy__default=module["default"];var setter={foo:module.foo};for(var nameinmodule){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},module=>{externalAuto=module["default"];},module=>{externalDefault=module;},module=>{externalDefaultOnly=module;}],execute:(function(){let a; exports('a',a);
 
 (v=>(exports('a',a),v))({ a } = b);
 console.log((v=>(exports('a',a),v))({ a } = b));
diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js
index b422345e1ef..11272f21563 100644
--- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js
+++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js
@@ -1,4 +1,4 @@
-((g,f)=>{typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.bundle={},g.defaultLegacy,g.externalAuto,g.externalDefault,g.externalDefaultOnly));})(this,((exports,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly)=>{'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};var _interopDefault=e=>e&&e.__esModule?e:{'default':e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,'default':e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}});}n["default"]=e;return Object.freeze(n);}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
+(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.bundle={},null,g.defaultLegacy,g.externalAuto,g.externalDefault,g.externalDefaultOnly));})(this,(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};var _interopDefault=e=>e&&e.__esModule?e:{'default':e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,'default':e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}});}n["default"]=e;return Object.freeze(n);}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0;
 
 ({ a: exports.a } = defaultLegacy.b);
 console.log({ a: exports.a } = defaultLegacy.b);
diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/system.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/system.js
index 90b7b98b4a8..5bb5c3b4f2f 100644
--- a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/system.js
+++ b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/system.js
@@ -1 +1 @@
-System.register('bundle',['external'],(function(){'use strict';var ns;return{setters:[(function(module){ns=module["default"];})],execute:(function(){console.log(ns);})}}));
\ No newline at end of file
+System.register('bundle',['external'],(function(){'use strict';var ns;return{setters:[function(module){ns=module["default"];}],execute:(function(){console.log(ns);})}}));
\ No newline at end of file
diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false/_expected/system.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false/_expected/system.js
index b7ad9f8df2f..0185eee89a2 100644
--- a/test/form/samples/generated-code-compact/reserved-names-as-props-false/_expected/system.js
+++ b/test/form/samples/generated-code-compact/reserved-names-as-props-false/_expected/system.js
@@ -1,4 +1,4 @@
-System.register('bundle',['external','externalDefaultOnly','external2'],(function(exports,module){'use strict';var function$1,defaultOnly,someDefault;return{setters:[(function(module){function$1=module["function"];exports({bar:module["function"],'default':module,'void':module["default"]});}),(function(module){defaultOnly=module;}),(function(module){someDefault=module["default"];})],execute:(function(){var other = {
+System.register('bundle',['external','externalDefaultOnly','external2'],(function(exports,module){'use strict';var function$1,defaultOnly,someDefault;return{setters:[function(module){function$1=module["function"];exports({bar:module["function"],'default':module,'void':module["default"]});},function(module){defaultOnly=module;},function(module){someDefault=module["default"];}],execute:(function(){var other = {
 	foo: 'bar'
 };var ns=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null),other,{'default':other}));console.log(ns, other.foo, other["function"], other["some-prop"], function$1, someDefault, defaultOnly);
 console.log(module.meta["function"], module.meta["some-prop"]);
diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/system.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/system.js
index 57e3a59c090..6ce74bdff15 100644
--- a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/system.js
+++ b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/system.js
@@ -1 +1 @@
-System.register('bundle',['external'],(function(){'use strict';var ns;return{setters:[(function(module){ns=module.default;})],execute:(function(){console.log(ns);})}}));
\ No newline at end of file
+System.register('bundle',['external'],(function(){'use strict';var ns;return{setters:[function(module){ns=module.default;}],execute:(function(){console.log(ns);})}}));
\ No newline at end of file
diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true/_expected/system.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true/_expected/system.js
index 8d3f169fa7e..25e83be937b 100644
--- a/test/form/samples/generated-code-compact/reserved-names-as-props-true/_expected/system.js
+++ b/test/form/samples/generated-code-compact/reserved-names-as-props-true/_expected/system.js
@@ -1,4 +1,4 @@
-System.register('bundle',['external','externalDefaultOnly','external2'],(function(exports,module){'use strict';var function$1,defaultOnly,someDefault;return{setters:[(function(module){function$1=module.function;exports({bar:module.function,default:module,void:module.default});}),(function(module){defaultOnly=module;}),(function(module){someDefault=module.default;})],execute:(function(){var other = {
+System.register('bundle',['external','externalDefaultOnly','external2'],(function(exports,module){'use strict';var function$1,defaultOnly,someDefault;return{setters:[function(module){function$1=module.function;exports({bar:module.function,default:module,void:module.default});},function(module){defaultOnly=module;},function(module){someDefault=module.default;}],execute:(function(){var other = {
 	foo: 'bar'
 };var ns=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null),other,{default:other}));console.log(ns, other.foo, other.function, other["some-prop"], function$1, someDefault, defaultOnly);
 console.log(module.meta.function, module.meta["some-prop"]);
diff --git a/test/form/samples/generated-code-presets/es2015/_expected.js b/test/form/samples/generated-code-presets/es2015/_expected.js
index cc8feee263f..86c4bbf67f4 100644
--- a/test/form/samples/generated-code-presets/es2015/_expected.js
+++ b/test/form/samples/generated-code-presets/es2015/_expected.js
@@ -1,7 +1,7 @@
-System.register('bundle', [], (exports => {
+System.register('bundle', [], (function (exports) {
 	'use strict';
 	return {
-		execute: (() => {
+		execute: (function () {
 
 			const foo = 1; exports({ foo, bar: foo, default: foo });
 
diff --git a/test/form/samples/generated-code/arrow-functions-false/_config.js b/test/form/samples/generated-code/arrow-functions-false/_config.js
index f00fa8ca8f1..4f4355ed2b8 100644
--- a/test/form/samples/generated-code/arrow-functions-false/_config.js
+++ b/test/form/samples/generated-code/arrow-functions-false/_config.js
@@ -1,7 +1,13 @@
 module.exports = {
 	description: 'does not use arrow functions',
 	options: {
-		external: ['external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'],
+		external: [
+			'external',
+			'externalAuto',
+			'externalDefault',
+			'externalDefaultOnly',
+			'externalNoImport'
+		],
 		strictDeprecations: false,
 		output: {
 			generatedCode: { arrowFunctions: false },
diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js b/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js
index f438e30cee8..e326b0ac099 100644
--- a/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js
+++ b/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js
@@ -1,4 +1,4 @@
-define(['require', 'exports', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict';
+define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict';
 
 	function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js b/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js
index 33bb905606f..cf21d2a1a97 100644
--- a/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js
+++ b/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js
@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('externalNoImport');
 var defaultLegacy = require('external');
 var externalAuto = require('externalAuto');
 var externalDefault = require('externalDefault');
diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/es.js b/test/form/samples/generated-code/arrow-functions-false/_expected/es.js
index ec0f685b155..33b3ba073bd 100644
--- a/test/form/samples/generated-code/arrow-functions-false/_expected/es.js
+++ b/test/form/samples/generated-code/arrow-functions-false/_expected/es.js
@@ -1,3 +1,4 @@
+import 'externalNoImport';
 import * as defaultLegacy from 'external';
 import defaultLegacy__default, { b } from 'external';
 export * from 'external';
diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js b/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js
index 325db8fd93f..3cf2e3c665a 100644
--- a/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js
+++ b/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js
@@ -1,4 +1,4 @@
-var bundle = (function (exports, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) {
+var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) {
 	'use strict';
 
 	function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -65,4 +65,4 @@ var bundle = (function (exports, defaultLegacy, externalAuto, externalDefault, e
 
 	return exports;
 
-})({}, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly);
+})({}, null, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly);
diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/system.js b/test/form/samples/generated-code/arrow-functions-false/_expected/system.js
index 616bd283824..fce43bec977 100644
--- a/test/form/samples/generated-code/arrow-functions-false/_expected/system.js
+++ b/test/form/samples/generated-code/arrow-functions-false/_expected/system.js
@@ -1,9 +1,9 @@
-System.register('bundle', ['external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (exports, module) {
+System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (exports, module) {
 	'use strict';
 	var _starExcludes = { a: 1, 'default': 1, foo: 1 };
 	var b, defaultLegacy, defaultLegacy__default, externalAuto, externalDefault, externalDefaultOnly;
 	return {
-		setters: [(function (module) {
+		setters: [function () {}, function (module) {
 			b = module.b;
 			defaultLegacy = module;
 			defaultLegacy__default = module["default"];
@@ -12,13 +12,13 @@ System.register('bundle', ['external', 'externalAuto', 'externalDefault', 'exter
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		}), (function (module) {
+		}, function (module) {
 			externalAuto = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			externalDefault = module;
-		}), (function (module) {
+		}, function (module) {
 			externalDefaultOnly = module;
-		})],
+		}],
 		execute: (function () {
 
 			let a; exports('a', a);
diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js b/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js
index 9ab910b2fec..71517778a30 100644
--- a/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js
+++ b/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external'), require('externalAuto'), require('externalDefault'), require('externalDefaultOnly')) :
-	typeof define === 'function' && define.amd ? define(['exports', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], factory) :
-	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.defaultLegacy, global.externalAuto, global.externalDefault, global.externalDefaultOnly));
-})(this, (function (exports, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict';
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('externalNoImport'), require('external'), require('externalAuto'), require('externalDefault'), require('externalDefaultOnly')) :
+	typeof define === 'function' && define.amd ? define(['exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], factory) :
+	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, null, global.defaultLegacy, global.externalAuto, global.externalDefault, global.externalDefaultOnly));
+})(this, (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict';
 
 	function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
diff --git a/test/form/samples/generated-code/arrow-functions-false/main.js b/test/form/samples/generated-code/arrow-functions-false/main.js
index 9dafadc5d2e..67951acbf27 100644
--- a/test/form/samples/generated-code/arrow-functions-false/main.js
+++ b/test/form/samples/generated-code/arrow-functions-false/main.js
@@ -1,3 +1,4 @@
+import 'externalNoImport';
 import { b } from 'external';
 export let a;
 
diff --git a/test/form/samples/generated-code/arrow-functions-true/_config.js b/test/form/samples/generated-code/arrow-functions-true/_config.js
index d4634b74309..26636f7344e 100644
--- a/test/form/samples/generated-code/arrow-functions-true/_config.js
+++ b/test/form/samples/generated-code/arrow-functions-true/_config.js
@@ -1,7 +1,13 @@
 module.exports = {
 	description: 'uses arrow functions',
 	options: {
-		external: ['external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'],
+		external: [
+			'external',
+			'externalAuto',
+			'externalDefault',
+			'externalDefaultOnly',
+			'externalNoImport'
+		],
 		strictDeprecations: false,
 		output: {
 			generatedCode: { arrowFunctions: true },
diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js b/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js
index b1adf05deb4..2124f8546df 100644
--- a/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js
+++ b/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js
@@ -1,4 +1,4 @@
-define(['require', 'exports', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], ((require, exports, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) => { 'use strict';
+define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict';
 
 	var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e };
 
diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js b/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js
index d34af67684f..5bc3143ea12 100644
--- a/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js
+++ b/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js
@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('externalNoImport');
 var defaultLegacy = require('external');
 var externalAuto = require('externalAuto');
 var externalDefault = require('externalDefault');
diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/es.js b/test/form/samples/generated-code/arrow-functions-true/_expected/es.js
index c979c0b3335..f8fd0fa5fde 100644
--- a/test/form/samples/generated-code/arrow-functions-true/_expected/es.js
+++ b/test/form/samples/generated-code/arrow-functions-true/_expected/es.js
@@ -1,3 +1,4 @@
+import 'externalNoImport';
 import * as defaultLegacy from 'external';
 import defaultLegacy__default, { b } from 'external';
 export * from 'external';
diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js b/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js
index b32ed22a1e4..cc434c43f79 100644
--- a/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js
+++ b/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js
@@ -1,4 +1,4 @@
-var bundle = ((exports, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) => {
+var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) {
 	'use strict';
 
 	var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e };
@@ -65,4 +65,4 @@ var bundle = ((exports, defaultLegacy, externalAuto, externalDefault, externalDe
 
 	return exports;
 
-})({}, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly);
+})({}, null, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly);
diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/system.js b/test/form/samples/generated-code/arrow-functions-true/_expected/system.js
index fd34b34a0ac..2fd699d848f 100644
--- a/test/form/samples/generated-code/arrow-functions-true/_expected/system.js
+++ b/test/form/samples/generated-code/arrow-functions-true/_expected/system.js
@@ -1,9 +1,9 @@
-System.register('bundle', ['external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], ((exports, module) => {
+System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (exports, module) {
 	'use strict';
 	var _starExcludes = { a: 1, 'default': 1, foo: 1 };
 	var b, defaultLegacy, defaultLegacy__default, externalAuto, externalDefault, externalDefaultOnly;
 	return {
-		setters: [(module => {
+		setters: [() => {}, module => {
 			b = module.b;
 			defaultLegacy = module;
 			defaultLegacy__default = module["default"];
@@ -12,14 +12,14 @@ System.register('bundle', ['external', 'externalAuto', 'externalDefault', 'exter
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		}), (module => {
+		}, module => {
 			externalAuto = module["default"];
-		}), (module => {
+		}, module => {
 			externalDefault = module;
-		}), (module => {
+		}, module => {
 			externalDefaultOnly = module;
-		})],
-		execute: (() => {
+		}],
+		execute: (function () {
 
 			let a; exports('a', a);
 
diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js b/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js
index 9dacb5750e5..fd52a6bf988 100644
--- a/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js
+++ b/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js
@@ -1,8 +1,8 @@
-((global, factory) => {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external'), require('externalAuto'), require('externalDefault'), require('externalDefaultOnly')) :
-	typeof define === 'function' && define.amd ? define(['exports', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], factory) :
-	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.defaultLegacy, global.externalAuto, global.externalDefault, global.externalDefaultOnly));
-})(this, ((exports, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) => { 'use strict';
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('externalNoImport'), require('external'), require('externalAuto'), require('externalDefault'), require('externalDefaultOnly')) :
+	typeof define === 'function' && define.amd ? define(['exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], factory) :
+	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, null, global.defaultLegacy, global.externalAuto, global.externalDefault, global.externalDefaultOnly));
+})(this, (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict';
 
 	var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e };
 
diff --git a/test/form/samples/generated-code/block-bindings-false/_expected/amd.js b/test/form/samples/generated-code/block-bindings-false/_expected/amd.js
index f40aa2aef22..e9d440077f5 100644
--- a/test/form/samples/generated-code/block-bindings-false/_expected/amd.js
+++ b/test/form/samples/generated-code/block-bindings-false/_expected/amd.js
@@ -1,4 +1,4 @@
-define(['external'], (foo => { 'use strict';
+define(['external'], (function (foo) { 'use strict';
 
 	var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e };
 
diff --git a/test/form/samples/generated-code/block-bindings-false/_expected/iife.js b/test/form/samples/generated-code/block-bindings-false/_expected/iife.js
index 55c4ee5a592..cbd56c70f3d 100644
--- a/test/form/samples/generated-code/block-bindings-false/_expected/iife.js
+++ b/test/form/samples/generated-code/block-bindings-false/_expected/iife.js
@@ -1,4 +1,4 @@
-(foo => {
+(function (foo) {
 	'use strict';
 
 	var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e };
diff --git a/test/form/samples/generated-code/block-bindings-false/_expected/system.js b/test/form/samples/generated-code/block-bindings-false/_expected/system.js
index 605c167387e..d60bfe90bc6 100644
--- a/test/form/samples/generated-code/block-bindings-false/_expected/system.js
+++ b/test/form/samples/generated-code/block-bindings-false/_expected/system.js
@@ -1,11 +1,11 @@
-System.register('bundle', ['external'], (() => {
+System.register('bundle', ['external'], (function () {
 	'use strict';
 	var foo;
 	return {
-		setters: [(module => {
+		setters: [module => {
 			foo = module["default"];
-		})],
-		execute: (() => {
+		}],
+		execute: (function () {
 
 			console.log(foo);
 
diff --git a/test/form/samples/generated-code/block-bindings-false/_expected/umd.js b/test/form/samples/generated-code/block-bindings-false/_expected/umd.js
index 7c3a9ea53a2..15f83b63294 100644
--- a/test/form/samples/generated-code/block-bindings-false/_expected/umd.js
+++ b/test/form/samples/generated-code/block-bindings-false/_expected/umd.js
@@ -1,8 +1,8 @@
-((global, factory) => {
+(function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('external')) :
 	typeof define === 'function' && define.amd ? define(['external'], factory) :
 	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo));
-})(this, (foo => { 'use strict';
+})(this, (function (foo) { 'use strict';
 
 	var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e };
 
diff --git a/test/form/samples/generated-code/block-bindings-true/_expected/amd.js b/test/form/samples/generated-code/block-bindings-true/_expected/amd.js
index 4915982dd6a..8e24f7538d0 100644
--- a/test/form/samples/generated-code/block-bindings-true/_expected/amd.js
+++ b/test/form/samples/generated-code/block-bindings-true/_expected/amd.js
@@ -1,4 +1,4 @@
-define(['external'], (foo => { 'use strict';
+define(['external'], (function (foo) { 'use strict';
 
 	const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e };
 
diff --git a/test/form/samples/generated-code/block-bindings-true/_expected/iife.js b/test/form/samples/generated-code/block-bindings-true/_expected/iife.js
index 5de8b83eee2..17ff8e302f3 100644
--- a/test/form/samples/generated-code/block-bindings-true/_expected/iife.js
+++ b/test/form/samples/generated-code/block-bindings-true/_expected/iife.js
@@ -1,4 +1,4 @@
-(foo => {
+(function (foo) {
 	'use strict';
 
 	const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e };
diff --git a/test/form/samples/generated-code/block-bindings-true/_expected/system.js b/test/form/samples/generated-code/block-bindings-true/_expected/system.js
index 605c167387e..d60bfe90bc6 100644
--- a/test/form/samples/generated-code/block-bindings-true/_expected/system.js
+++ b/test/form/samples/generated-code/block-bindings-true/_expected/system.js
@@ -1,11 +1,11 @@
-System.register('bundle', ['external'], (() => {
+System.register('bundle', ['external'], (function () {
 	'use strict';
 	var foo;
 	return {
-		setters: [(module => {
+		setters: [module => {
 			foo = module["default"];
-		})],
-		execute: (() => {
+		}],
+		execute: (function () {
 
 			console.log(foo);
 
diff --git a/test/form/samples/generated-code/block-bindings-true/_expected/umd.js b/test/form/samples/generated-code/block-bindings-true/_expected/umd.js
index a811c2e1af9..78289a276b4 100644
--- a/test/form/samples/generated-code/block-bindings-true/_expected/umd.js
+++ b/test/form/samples/generated-code/block-bindings-true/_expected/umd.js
@@ -1,8 +1,8 @@
-((global, factory) => {
+(function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('external')) :
 	typeof define === 'function' && define.amd ? define(['external'], factory) :
 	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo));
-})(this, (foo => { 'use strict';
+})(this, (function (foo) { 'use strict';
 
 	const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e };
 
diff --git a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/system.js b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/system.js
index e234fc72ef2..9492986904f 100644
--- a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/system.js
+++ b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/system.js
@@ -2,9 +2,9 @@ System.register('bundle', ['external'], (function () {
 	'use strict';
 	var ns;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			ns = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log(ns);
diff --git a/test/form/samples/generated-code/reserved-names-as-props-false/_expected/system.js b/test/form/samples/generated-code/reserved-names-as-props-false/_expected/system.js
index 52246a6e226..9ce4021ee63 100644
--- a/test/form/samples/generated-code/reserved-names-as-props-false/_expected/system.js
+++ b/test/form/samples/generated-code/reserved-names-as-props-false/_expected/system.js
@@ -2,14 +2,14 @@ System.register('bundle', ['external', 'externalDefaultOnly', 'external2'], (fun
 	'use strict';
 	var function$1, defaultOnly, someDefault;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			function$1 = module["function"];
 			exports({ bar: module["function"], 'default': module, 'void': module["default"] });
-		}), (function (module) {
+		}, function (module) {
 			defaultOnly = module;
-		}), (function (module) {
+		}, function (module) {
 			someDefault = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			var other = {
diff --git a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/system.js b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/system.js
index 582a0461b73..cdd74b852bf 100644
--- a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/system.js
+++ b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/system.js
@@ -2,9 +2,9 @@ System.register('bundle', ['external'], (function () {
 	'use strict';
 	var ns;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			ns = module.default;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(ns);
diff --git a/test/form/samples/generated-code/reserved-names-as-props-true/_expected/system.js b/test/form/samples/generated-code/reserved-names-as-props-true/_expected/system.js
index aa707ddf556..5e2e548ba5d 100644
--- a/test/form/samples/generated-code/reserved-names-as-props-true/_expected/system.js
+++ b/test/form/samples/generated-code/reserved-names-as-props-true/_expected/system.js
@@ -2,14 +2,14 @@ System.register('bundle', ['external', 'externalDefaultOnly', 'external2'], (fun
 	'use strict';
 	var function$1, defaultOnly, someDefault;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			function$1 = module.function;
 			exports({ bar: module.function, default: module, void: module.default });
-		}), (function (module) {
+		}, function (module) {
 			defaultOnly = module;
-		}), (function (module) {
+		}, function (module) {
 			someDefault = module.default;
-		})],
+		}],
 		execute: (function () {
 
 			var other = {
diff --git a/test/form/samples/globals-function/_expected/system.js b/test/form/samples/globals-function/_expected/system.js
index 03a46290406..d06b40ba546 100644
--- a/test/form/samples/globals-function/_expected/system.js
+++ b/test/form/samples/globals-function/_expected/system.js
@@ -2,11 +2,11 @@ System.register('myBundle', ['a', 'b'], (function () {
 	'use strict';
 	var a, b;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			a = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			b = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log(a, b);
diff --git a/test/form/samples/guessed-global-names/_expected/system.js b/test/form/samples/guessed-global-names/_expected/system.js
index 9f058b740a2..d29d82d75d6 100644
--- a/test/form/samples/guessed-global-names/_expected/system.js
+++ b/test/form/samples/guessed-global-names/_expected/system.js
@@ -2,17 +2,17 @@ System.register(['unchanged', 'changed', 'special-character', 'with/slash', './r
 	'use strict';
 	var foo, changedName, bar, baz, quux;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.foo;
-		}), (function (module) {
+		}, function (module) {
 			changedName = module["default"];
-		}), (function (module) {
+		}, function (module) {
 			bar = module.bar;
-		}), (function (module) {
+		}, function (module) {
 			baz = module.baz;
-		}), (function (module) {
+		}, function (module) {
 			quux = module.quux;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, changedName, bar, baz, quux);
diff --git a/test/form/samples/import-expression/_expected/system.js b/test/form/samples/import-expression/_expected/system.js
index 18015c6e7fd..ea9aa2a765d 100644
--- a/test/form/samples/import-expression/_expected/system.js
+++ b/test/form/samples/import-expression/_expected/system.js
@@ -2,9 +2,9 @@ System.register(['external'], (function (exports, module) {
 	'use strict';
 	var join;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			join = module.join;
-		})],
+		}],
 		execute: (function () {
 
 			module.import(join('a', 'b'));
diff --git a/test/form/samples/import-external-namespace-and-default/_expected/system.js b/test/form/samples/import-external-namespace-and-default/_expected/system.js
index 98de3e82a19..132e4c4c2ee 100644
--- a/test/form/samples/import-external-namespace-and-default/_expected/system.js
+++ b/test/form/samples/import-external-namespace-and-default/_expected/system.js
@@ -2,10 +2,10 @@ System.register(['foo'], (function () {
 	'use strict';
 	var foo, foo__default;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module;
 			foo__default = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log( foo.bar );
diff --git a/test/form/samples/import-namespace-systemjs/_expected.js b/test/form/samples/import-namespace-systemjs/_expected.js
index ffe4407bff5..06533e7c576 100644
--- a/test/form/samples/import-namespace-systemjs/_expected.js
+++ b/test/form/samples/import-namespace-systemjs/_expected.js
@@ -2,9 +2,9 @@ System.register(['dependency'], (function () {
 	'use strict';
 	var dependency;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			dependency = module;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(dependency);
diff --git a/test/form/samples/import-namespace/_expected/system.js b/test/form/samples/import-namespace/_expected/system.js
index 388a88613c8..a623e44a868 100644
--- a/test/form/samples/import-namespace/_expected/system.js
+++ b/test/form/samples/import-namespace/_expected/system.js
@@ -2,11 +2,11 @@ System.register(['foo', 'bar'], (function () {
 	'use strict';
 	var foo, bar;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module;
-		}), (function (module) {
+		}, function (module) {
 			bar = module;
-		})],
+		}],
 		execute: (function () {
 
 			foo.x();
diff --git a/test/form/samples/import-specifier-deshadowing/_expected/system.js b/test/form/samples/import-specifier-deshadowing/_expected/system.js
index fb6af892de4..86ac997fc91 100644
--- a/test/form/samples/import-specifier-deshadowing/_expected/system.js
+++ b/test/form/samples/import-specifier-deshadowing/_expected/system.js
@@ -2,9 +2,9 @@ System.register('Sticky', ['react-sticky'], (function (exports) {
 	'use strict';
 	var Sticky$1;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			Sticky$1 = module.Sticky;
-		})],
+		}],
 		execute: (function () {
 
 			var Sticky = exports('default', function () {
diff --git a/test/form/samples/interop-per-dependency-no-freeze/_expected/system.js b/test/form/samples/interop-per-dependency-no-freeze/_expected/system.js
index b7f903cc27c..095409512b8 100644
--- a/test/form/samples/interop-per-dependency-no-freeze/_expected/system.js
+++ b/test/form/samples/interop-per-dependency-no-freeze/_expected/system.js
@@ -2,22 +2,22 @@ System.register(['external-auto', 'external-default', 'external-defaultOnly', 'e
 	'use strict';
 	var fooAuto__default, barAuto, fooAuto, fooDefault__default, barDefault, fooDefault, fooDefaultOnly__default, fooDefaultOnly, fooEsModule__default, barEsModule, fooEsModule;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			fooAuto__default = module["default"];
 			barAuto = module.barAuto;
 			fooAuto = module;
-		}), (function (module) {
+		}, function (module) {
 			fooDefault__default = module["default"];
 			barDefault = module.barDefault;
 			fooDefault = module;
-		}), (function (module) {
+		}, function (module) {
 			fooDefaultOnly__default = module["default"];
 			fooDefaultOnly = module;
-		}), (function (module) {
+		}, function (module) {
 			fooEsModule__default = module["default"];
 			barEsModule = module.barEsModule;
 			fooEsModule = module;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(fooAuto__default, barAuto, fooAuto);
diff --git a/test/form/samples/interop-per-dependency/_expected/system.js b/test/form/samples/interop-per-dependency/_expected/system.js
index 334b4bc6a2e..fe9ae5cede9 100644
--- a/test/form/samples/interop-per-dependency/_expected/system.js
+++ b/test/form/samples/interop-per-dependency/_expected/system.js
@@ -2,22 +2,22 @@ System.register(['external-auto', 'external-default', 'external-defaultOnly', 'e
 	'use strict';
 	var fooAuto__default, barAuto, fooAuto, fooDefault__default, barDefault, fooDefault, fooDefaultOnly__default, fooDefaultOnly, fooEsModule__default, barEsModule, fooEsModule;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			fooAuto__default = module["default"];
 			barAuto = module.barAuto;
 			fooAuto = module;
-		}), (function (module) {
+		}, function (module) {
 			fooDefault__default = module["default"];
 			barDefault = module.barDefault;
 			fooDefault = module;
-		}), (function (module) {
+		}, function (module) {
 			fooDefaultOnly__default = module["default"];
 			fooDefaultOnly = module;
-		}), (function (module) {
+		}, function (module) {
 			fooEsModule__default = module["default"];
 			barEsModule = module.barEsModule;
 			fooEsModule = module;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(fooAuto__default, barAuto, fooAuto);
diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/system.js b/test/form/samples/interop-per-reexported-dependency/_expected/system.js
index 1f70094c66d..4c3ae37ca99 100644
--- a/test/form/samples/interop-per-reexported-dependency/_expected/system.js
+++ b/test/form/samples/interop-per-reexported-dependency/_expected/system.js
@@ -1,15 +1,15 @@
 System.register('bundle', ['external-auto', 'external-default', 'external-defaultOnly', 'external-esModule'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports({ barAuto: module.barAuto, externalAuto: module, fooAuto: module["default"] });
-		}), (function (module) {
+		}, function (module) {
 			exports({ barDefault: module.barDefault, externalDefault: module, fooDefault: module["default"] });
-		}), (function (module) {
+		}, function (module) {
 			exports('fooDefaultOnly', module["default"]);
-		}), (function (module) {
+		}, function (module) {
 			exports({ barEsModule: module.barEsModule, externalEsModule: module, fooEsModule: module["default"] });
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/intro-and-outro/_expected/system.js b/test/form/samples/intro-and-outro/_expected/system.js
index 2c699bfa89c..e8faf657dd7 100644
--- a/test/form/samples/intro-and-outro/_expected/system.js
+++ b/test/form/samples/intro-and-outro/_expected/system.js
@@ -2,10 +2,10 @@ System.register('foo', ['external'], (function (exports) {
 	'use strict';
 	var a, b;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			a = module["default"];
 			b = module.b;
-		})],
+		}],
 		execute: (function () {
 
 			/* this is an intro */
diff --git a/test/form/samples/namespace-import-reexport-2/_expected/system.js b/test/form/samples/namespace-import-reexport-2/_expected/system.js
index 7b6e5d547b7..a29fe580741 100644
--- a/test/form/samples/namespace-import-reexport-2/_expected/system.js
+++ b/test/form/samples/namespace-import-reexport-2/_expected/system.js
@@ -1,11 +1,11 @@
 System.register('iife', ['external1', 'external2'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('x', module.x);
-		}), (function (module) {
+		}, function (module) {
 			exports('ext', module);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/namespace-import-reexport/_expected/system.js b/test/form/samples/namespace-import-reexport/_expected/system.js
index ffb76f17b6d..a4e6fc29b32 100644
--- a/test/form/samples/namespace-import-reexport/_expected/system.js
+++ b/test/form/samples/namespace-import-reexport/_expected/system.js
@@ -1,9 +1,9 @@
 System.register('iife', ['external-package'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('ext', module);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/namespace-reexport-name/_expected/system.js b/test/form/samples/namespace-reexport-name/_expected/system.js
index b63850f7c9c..919835751d5 100644
--- a/test/form/samples/namespace-reexport-name/_expected/system.js
+++ b/test/form/samples/namespace-reexport-name/_expected/system.js
@@ -3,14 +3,14 @@ System.register('bundle', ['external'], (function (exports) {
 	var _starExcludes = { renamedIndirectOverride: 1, 'default': 1, renamedDirectOverride: 1 };
 	var indirectOverride;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			indirectOverride = module.indirectOverride;
 			var setter = { renamedDirectOverride: module.directOverride };
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		})],
+		}],
 		execute: (function () {
 
 			const renamedIndirectOverride = exports('renamedIndirectOverride', indirectOverride);
diff --git a/test/form/samples/namespace-tostring/external-namespaces/_expected/system.js b/test/form/samples/namespace-tostring/external-namespaces/_expected/system.js
index 4fbbcc6db24..76dd2bf6c12 100644
--- a/test/form/samples/namespace-tostring/external-namespaces/_expected/system.js
+++ b/test/form/samples/namespace-tostring/external-namespaces/_expected/system.js
@@ -2,13 +2,13 @@ System.register(['external-auto', 'external-default', 'external-defaultOnly'], (
 	'use strict';
 	var externalAuto, externalDefault, externalDefaultOnly;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			externalAuto = module;
-		}), (function (module) {
+		}, function (module) {
 			externalDefault = module;
-		}), (function (module) {
+		}, function (module) {
 			externalDefaultOnly = module;
-		})],
+		}],
 		execute: (function () {
 
 			assert.strictEqual(externalAuto[Symbol.toStringTag], 'Module');
diff --git a/test/form/samples/no-external-live-bindings-compact/_expected/system.js b/test/form/samples/no-external-live-bindings-compact/_expected/system.js
index 01b4300c8da..b90fb89f2e8 100644
--- a/test/form/samples/no-external-live-bindings-compact/_expected/system.js
+++ b/test/form/samples/no-external-live-bindings-compact/_expected/system.js
@@ -1 +1 @@
-System.register('bundle',['external1','external2'],(function(exports,module){'use strict';var _starExcludes={dynamic:1,'default':1,external1:1};return{setters:[(function(module){exports('external1',module.external1);}),(function(module){var setter={};for(var nameinmodule){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);})],execute:(function(){const dynamic = exports('dynamic',module.import('external3'));})}}));
\ No newline at end of file
+System.register('bundle',['external1','external2'],(function(exports,module){'use strict';var _starExcludes={dynamic:1,'default':1,external1:1};return{setters:[function(module){exports('external1',module.external1);},function(module){var setter={};for(var nameinmodule){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);}],execute:(function(){const dynamic = exports('dynamic',module.import('external3'));})}}));
\ No newline at end of file
diff --git a/test/form/samples/no-external-live-bindings/_expected/system.js b/test/form/samples/no-external-live-bindings/_expected/system.js
index 5762a01844e..e1007b34774 100644
--- a/test/form/samples/no-external-live-bindings/_expected/system.js
+++ b/test/form/samples/no-external-live-bindings/_expected/system.js
@@ -2,15 +2,15 @@ System.register('bundle', ['external1', 'external2'], (function (exports, module
 	'use strict';
 	var _starExcludes = { dynamic: 1, 'default': 1, external1: 1 };
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('external1', module.external1);
-		}), (function (module) {
+		}, function (module) {
 			var setter = {};
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		})],
+		}],
 		execute: (function () {
 
 			const dynamic = exports('dynamic', module.import('external3'));
diff --git a/test/form/samples/ns-external-star-reexport/_expected/system.js b/test/form/samples/ns-external-star-reexport/_expected/system.js
index 00ad9ac5c1d..eeb805b339a 100644
--- a/test/form/samples/ns-external-star-reexport/_expected/system.js
+++ b/test/form/samples/ns-external-star-reexport/_expected/system.js
@@ -2,11 +2,11 @@ System.register('bundle', ['external1', 'external2'], (function (exports) {
 	'use strict';
 	var external1, external2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			external1 = module;
-		}), (function (module) {
+		}, function (module) {
 			external2 = module;
-		})],
+		}],
 		execute: (function () {
 
 			var reexportExternal = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), external1));
diff --git a/test/form/samples/override-external-namespace/_expected/system.js b/test/form/samples/override-external-namespace/_expected/system.js
index 5712bac2c2f..bec86c75ba3 100644
--- a/test/form/samples/override-external-namespace/_expected/system.js
+++ b/test/form/samples/override-external-namespace/_expected/system.js
@@ -2,13 +2,13 @@ System.register('bundle', ['external'], (function (exports) {
 	'use strict';
 	var _starExcludes = { a: 1, b: 1, c: 1, reassign: 1, 'default': 1 };
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			var setter = {};
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		})],
+		}],
 		execute: (function () {
 
 			const a = exports('a', 'defined');
diff --git a/test/form/samples/paths-function/_expected/system.js b/test/form/samples/paths-function/_expected/system.js
index c8c75474d80..3416ad7ebfa 100644
--- a/test/form/samples/paths-function/_expected/system.js
+++ b/test/form/samples/paths-function/_expected/system.js
@@ -2,9 +2,9 @@ System.register(['https://unpkg.com/foo'], (function (exports, module) {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			assert.equal(foo, 42);
diff --git a/test/form/samples/paths-relative/_expected/system.js b/test/form/samples/paths-relative/_expected/system.js
index fc227f351a3..801139a433e 100644
--- a/test/form/samples/paths-relative/_expected/system.js
+++ b/test/form/samples/paths-relative/_expected/system.js
@@ -2,9 +2,9 @@ System.register(['../foo'], (function () {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			assert.equal( foo, 42 );
diff --git a/test/form/samples/paths/_expected/system.js b/test/form/samples/paths/_expected/system.js
index de31b6f952d..70a24a21851 100644
--- a/test/form/samples/paths/_expected/system.js
+++ b/test/form/samples/paths/_expected/system.js
@@ -2,9 +2,9 @@ System.register(['https://unpkg.com/foo'], (function () {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			assert.equal( foo, 42 );
diff --git a/test/form/samples/prefer-const/_expected/system.js b/test/form/samples/prefer-const/_expected/system.js
index a0ed88f0145..aca77a4b356 100644
--- a/test/form/samples/prefer-const/_expected/system.js
+++ b/test/form/samples/prefer-const/_expected/system.js
@@ -2,9 +2,9 @@ System.register('myBundle', ['other'], (function (exports) {
 	'use strict';
 	var name;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			name = module.name;
-		})],
+		}],
 		execute: (function () {
 
 			const a = 1;
diff --git a/test/form/samples/probe-external-namespace/_expected/system.js b/test/form/samples/probe-external-namespace/_expected/system.js
index 62bd2a994da..51377ded700 100644
--- a/test/form/samples/probe-external-namespace/_expected/system.js
+++ b/test/form/samples/probe-external-namespace/_expected/system.js
@@ -2,9 +2,9 @@ System.register(['external'], (function () {
 	'use strict';
 	var external;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			external = module;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(external.default, external.foo);
diff --git a/test/form/samples/quote-id/_expected/system.js b/test/form/samples/quote-id/_expected/system.js
index 84dda175b86..f5a9740eb0a 100644
--- a/test/form/samples/quote-id/_expected/system.js
+++ b/test/form/samples/quote-id/_expected/system.js
@@ -4,13 +4,13 @@ System.register('Q', ['quoted\'\
\
 	'use strict';
 	var foo, bar, baz;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.foo;
-		}), (function (module) {
+		}, function (module) {
 			bar = module.bar;
-		}), (function (module) {
+		}, function (module) {
 			baz = module.baz;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo, bar, baz);
diff --git a/test/form/samples/re-export-aliasing/_expected/system.js b/test/form/samples/re-export-aliasing/_expected/system.js
index a6f8ad79a78..4b0f46cff83 100644
--- a/test/form/samples/re-export-aliasing/_expected/system.js
+++ b/test/form/samples/re-export-aliasing/_expected/system.js
@@ -1,9 +1,9 @@
 System.register('reexportsAliasingExternal', ['d'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('b', module.d);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/reexport-external-default-and-name/_expected/system.js b/test/form/samples/reexport-external-default-and-name/_expected/system.js
index f628333dad8..df3c5243ef3 100644
--- a/test/form/samples/reexport-external-default-and-name/_expected/system.js
+++ b/test/form/samples/reexport-external-default-and-name/_expected/system.js
@@ -1,9 +1,9 @@
 System.register('bundle', ['external'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 			const value = exports('value', 42);
diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/system.js b/test/form/samples/reexport-external-default-and-namespace/_expected/system.js
index 902312e73f7..5512063a4a1 100644
--- a/test/form/samples/reexport-external-default-and-namespace/_expected/system.js
+++ b/test/form/samples/reexport-external-default-and-namespace/_expected/system.js
@@ -2,13 +2,13 @@ System.register('bundle', ['external'], (function (exports) {
 	'use strict';
 	var _starExcludes = { 'default': 1 };
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			var setter = { 'default': module["default"] };
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/system.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/system.js
index 5e8826c030d..17a63ad0376 100644
--- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/system.js
+++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/system.js
@@ -2,10 +2,10 @@ System.register('bundle', ['external'], (function (exports) {
 	'use strict';
 	var value;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			value = module.value;
 			exports('reexported', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 			console.log(value);
diff --git a/test/form/samples/reexport-external-default/_expected/system.js b/test/form/samples/reexport-external-default/_expected/system.js
index 36e7cbd18f5..001c24f58b1 100644
--- a/test/form/samples/reexport-external-default/_expected/system.js
+++ b/test/form/samples/reexport-external-default/_expected/system.js
@@ -2,11 +2,11 @@ System.register('bundle', ['external1', 'external2'], (function (exports) {
 	'use strict';
 	var foo;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			foo = module.foo;
-		}), (function (module) {
+		}, function (module) {
 			exports('default', module["default"]);
-		})],
+		}],
 		execute: (function () {
 
 			console.log(foo);
diff --git a/test/form/samples/reexport-external-name-as-default/_expected/system.js b/test/form/samples/reexport-external-name-as-default/_expected/system.js
index 5ad94e068c1..b8bfe4aa105 100644
--- a/test/form/samples/reexport-external-name-as-default/_expected/system.js
+++ b/test/form/samples/reexport-external-name-as-default/_expected/system.js
@@ -1,9 +1,9 @@
 System.register('bundle', ['external'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module.value);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/reexport-external-name-as-default2/_expected/system.js b/test/form/samples/reexport-external-name-as-default2/_expected/system.js
index 68f75b2df20..e3e0b8d8ce0 100644
--- a/test/form/samples/reexport-external-name-as-default2/_expected/system.js
+++ b/test/form/samples/reexport-external-name-as-default2/_expected/system.js
@@ -1,9 +1,9 @@
 System.register('bundle', ['external'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('default', module.objAlias);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/reexport-external-name/_expected/system.js b/test/form/samples/reexport-external-name/_expected/system.js
index b2c8b7f89b1..525b87018a8 100644
--- a/test/form/samples/reexport-external-name/_expected/system.js
+++ b/test/form/samples/reexport-external-name/_expected/system.js
@@ -1,11 +1,11 @@
 System.register('bundle', ['external1', 'external2'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('foo', module.foo);
-		}), (function (module) {
+		}, function (module) {
 			exports('bar', module.foo);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/reexport-external-namespace-as/_expected/system.js b/test/form/samples/reexport-external-namespace-as/_expected/system.js
index 47a73e08b9c..b54d0ef3edc 100644
--- a/test/form/samples/reexport-external-namespace-as/_expected/system.js
+++ b/test/form/samples/reexport-external-namespace-as/_expected/system.js
@@ -1,9 +1,9 @@
 System.register('bundle', ['external'], (function (exports) {
 	'use strict';
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports({ external: module, indirect: module });
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/reexport-external-namespace/_expected/system.js b/test/form/samples/reexport-external-namespace/_expected/system.js
index 67dc7d85118..15ac3150f18 100644
--- a/test/form/samples/reexport-external-namespace/_expected/system.js
+++ b/test/form/samples/reexport-external-namespace/_expected/system.js
@@ -2,13 +2,13 @@ System.register('bundle', ['external'], (function (exports) {
 	'use strict';
 	var _starExcludes = { 'default': 1 };
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			var setter = {};
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/system.js b/test/form/samples/reexport-used-external-namespace-as/_expected/system.js
index c34aaab1f72..fda26cc6c98 100644
--- a/test/form/samples/reexport-used-external-namespace-as/_expected/system.js
+++ b/test/form/samples/reexport-used-external-namespace-as/_expected/system.js
@@ -2,13 +2,13 @@ System.register('bundle', ['external1', 'external2'], (function (exports) {
 	'use strict';
 	var imported1, imported2;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			imported1 = module;
 			exports('external1', module);
-		}), (function (module) {
+		}, function (module) {
 			imported2 = module.imported2;
 			exports('external2', module);
-		})],
+		}],
 		execute: (function () {
 
 			console.log(imported1, imported2);
diff --git a/test/form/samples/relative-external-with-global/_expected/system.js b/test/form/samples/relative-external-with-global/_expected/system.js
index 3d6b202c49e..c3177a2eca1 100644
--- a/test/form/samples/relative-external-with-global/_expected/system.js
+++ b/test/form/samples/relative-external-with-global/_expected/system.js
@@ -2,9 +2,9 @@ System.register(['./lib/throttle.js'], (function () {
 	'use strict';
 	var throttle;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			throttle = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			throttle( () => {
diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/system.js b/test/form/samples/resolve-external-dynamic-imports/_expected/system.js
index 05f39a07c0a..cd91fed5cf8 100644
--- a/test/form/samples/resolve-external-dynamic-imports/_expected/system.js
+++ b/test/form/samples/resolve-external-dynamic-imports/_expected/system.js
@@ -2,9 +2,9 @@ System.register('bundle', ['external'], (function (exports, module) {
 	'use strict';
 	var myExternal;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			myExternal = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			const test = exports('test', () => myExternal);
diff --git a/test/form/samples/system-module-reserved/_expected/system.js b/test/form/samples/system-module-reserved/_expected/system.js
index 2d3c2799296..945afaa55e8 100644
--- a/test/form/samples/system-module-reserved/_expected/system.js
+++ b/test/form/samples/system-module-reserved/_expected/system.js
@@ -2,10 +2,10 @@ System.register('systemReserved', ['test'], (function () {
 	'use strict';
 	var module$1, other;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			module$1 = module.module;
 			other = module.other;
-		})],
+		}],
 		execute: (function () {
 
 			console.log(module$1, other);
diff --git a/test/form/samples/system-reexports/_expected.js b/test/form/samples/system-reexports/_expected.js
index 88b38623321..8d581d9b5c1 100644
--- a/test/form/samples/system-reexports/_expected.js
+++ b/test/form/samples/system-reexports/_expected.js
@@ -2,25 +2,25 @@ System.register(['external1', 'external2', 'external3', 'external4', 'external5'
 	'use strict';
 	var _starExcludes = { 'default': 1, namedReexport1: 1, namedReexport2a: 1, namedReexport2b: 1, namespaceReexport3: 1, namedReexport5: 1, namespaceReexport5: 1 };
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			exports('namedReexport1', module.namedReexport1);
-		}), (function (module) {
+		}, function (module) {
 			exports({ namedReexport2a: module.namedReexport2a, namedReexport2b: module["default"] });
-		}), (function (module) {
+		}, function (module) {
 			exports('namespaceReexport3', module);
-		}), (function (module) {
+		}, function (module) {
 			var setter = {};
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		}), (function (module) {
+		}, function (module) {
 			var setter = { namedReexport5: module.namedReexport5, namespaceReexport5: module };
 			for (var name in module) {
 				if (!_starExcludes[name]) setter[name] = module[name];
 			}
 			exports(setter);
-		})],
+		}],
 		execute: (function () {
 
 
diff --git a/test/form/samples/url-external/_expected/system.js b/test/form/samples/url-external/_expected/system.js
index 71590b4ae54..8e0d55f6470 100644
--- a/test/form/samples/url-external/_expected/system.js
+++ b/test/form/samples/url-external/_expected/system.js
@@ -2,9 +2,9 @@ System.register(['https://external.com/external.js'], (function () {
 	'use strict';
 	var external;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			external = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			console.log(external);
diff --git a/test/form/samples/use-global-map-for-export-name/_expected/system.js b/test/form/samples/use-global-map-for-export-name/_expected/system.js
index a424855a0c2..9ecc113789d 100644
--- a/test/form/samples/use-global-map-for-export-name/_expected/system.js
+++ b/test/form/samples/use-global-map-for-export-name/_expected/system.js
@@ -2,9 +2,9 @@ System.register('leaflet.terminator', ['leaflet'], (function () {
 	'use strict';
 	var L;
 	return {
-		setters: [(function (module) {
+		setters: [function (module) {
 			L = module["default"];
-		})],
+		}],
 		execute: (function () {
 
 			L.terminator = function(options) {